PostgreSQL: export all FKs after all CREATE TABLE

vrana · Jul 19, 2019 · 72b1dcd · 72b1dcd
1 parent 6e4fd88
commit 72b1dcd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
@@ -730,7 +730,7 @@ function foreign_keys_sql($table) {
 		ksort($fkeys);
 
 		foreach ($fkeys as $fkey_name => $fkey) {
-			$return .= "ALTER TABLE ONLY " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " ADD CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+			$return .= "ALTER TABLE ONLY " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " ADD CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE') . ";\n";
 		}
 
 		return $return;
@@ -793,8 +793,6 @@ function create_sql($table, $auto_increment, $style) {
 			$return_parts[] = "CONSTRAINT " . idf_escape($conname) . " CHECK " . $consrc;
 		}
 
-//$return .= "\n\n" . var_export($constraints, true) . "\n\n";
-
 		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
 
 		// "basic" indexes after table definition
@@ -819,9 +817,6 @@ function create_sql($table, $auto_increment, $style) {
 			}
 		}
 
-$return .= "\n\n-- FKs\n";
-$return .= foreign_keys_sql($table);
-
 		return rtrim($return, ';');
 	}
 

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
@@ -105,6 +105,17 @@
 					}
 				}
 
+				// add FKs after creating tables (except in mysql which uses SET FOREIGN_KEY_CHECKS=0;)
+				if (function_exists('foreign_keys_sql') {
+					foreach (table_status('', true) as $name => $table_status) {
+						$table = (DB == "" || in_array($name, (array) $_POST["tables"]));
+						$data = (DB == "" || in_array($name, (array) $_POST["data"]));
+						if ($table && !is_view($table_status)) {
+							echo foreign_keys_sql($name)."\n";
+						}
+					}
+				}
+
 				foreach ($views as $view) {
 					$adminer->dumpTable($view, $_POST["table_style"], 1);
 				}