From: Jakub Vrana Date: Thu, 22 Dec 2011 05:59:24 +0000 (-0800) Subject: Respect namespace in foreign keys (thanks to Kleps Ota) X-Git-Tag: v3.3.4~29 X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=543e1725138e80f1d5259d0a82db0c33c921305b;p=adminer.git Respect namespace in foreign keys (thanks to Kleps Ota) --- diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index dfbd5d22..fec92a29 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -276,7 +276,7 @@ ORDER BY a.attnum" $return = array(); 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) . ") +WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS pn ON (pn.oid = pc.relnamespace) WHERE pc.relname = " . q($table) . " AND pn.nspname = current_schema()) AND contype = 'f'::char ORDER BY conkey, conname") as $row) { if (preg_match('~FOREIGN KEY\s*\((.+)\)\s*REFERENCES (.+)\((.+)\)(.*)$~iA', $row['definition'], $match)) {