Fix foreign key schema

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index c5a0c8135ef8e2d481a2efcc43c357c27a5bfcae..940d7659c22a45768ed7b63f78e77d3351cb117c 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -271,7 +271,7 @@ ORDER BY a.attnum"
        function foreign_keys($table) {
                global $on_actions;
                $return = array();
-               foreach (get_rows("SELECT conname, (SELECT nspname FROM pg_namespace WHERE oid = connamespace) AS ns, pg_get_constraintdef(oid) AS definition
+               foreach (get_rows("SELECT conname, pg_get_constraintdef(oid) AS definition
 FROM pg_constraint
 WHERE conrelid = (SELECT oid FROM pg_class WHERE relname = " . q($table) . ")
 AND contype = 'f'::char
@@ -279,6 +279,10 @@ ORDER BY conkey, conname") as $row) {
                        if (preg_match('~FOREIGN KEY\s*\((.+)\)\s*REFERENCES (.+)\((.+)\)(.*)$~iA', $row['definition'], $match)) {
                                $row['source'] = array_map('trim', explode(',', $match[1]));
                                $row['table'] = $match[2];
+                               if (preg_match('~(.+)\.(.+)~', $match[2], $match2)) {
+                                       $row['ns'] = $match2[1];
+                                       $row['table'] = $match2[2];
+                               }
                                $row['target'] = array_map('trim', explode(',', $match[3]));
                                $row['on_delete'] = (preg_match('~ON DELETE (' . implode('|', $on_actions) . ')~', $match[4], $match2) ? $match2[1] : '');
                                $row['on_update'] = (preg_match('~ON UPDATE (' . implode('|', $on_actions) . ')~', $match[4], $match2) ? $match2[1] : '');