From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 26 Feb 2025 18:55:49 +0000 (+0100)
Subject: PostgreSQL: Move primary key in export back to table
X-Git-Tag: v5.0.0~116
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=a603de853d67f21bc255f2684aec017e3920050b;p=adminer.git

PostgreSQL: Move primary key in export back to table
---

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 3e254830..d73c56d5 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -814,6 +814,14 @@ AND typelem = 0"
 			$return = implode("\n\n", $sequences) . "\n\n$return";
 		}
 
+		$primary = "";
+		foreach (indexes($table) as $index_name => $index) {
+			if ($index['type'] == 'PRIMARY') {
+				$primary = $index_name;
+				$return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")";
+			}
+		}
+
 		foreach ($driver->checkConstraints($table) as $conname => $consrc) {
 			$return_parts[] = "CONSTRAINT " . idf_escape($conname) . " $consrc";
 		}
@@ -831,7 +839,7 @@ AND typelem = 0"
 			}
 		}
 
-		foreach (get_rows("SELECT indexdef FROM pg_catalog.pg_indexes WHERE schemaname = current_schema() AND tablename = " . q($table), null, "-- ") as $row) {
+		foreach (get_rows("SELECT indexdef FROM pg_catalog.pg_indexes WHERE schemaname = current_schema() AND tablename = " . q($table) . ($primary ? " AND indexname != " . q($primary) : ""), null, "-- ") as $row) {
 			$return .= "\n\n$row[indexdef];";
 		}