PostgreSQL 11-: Avoid duplicate oid in table status (fix #1089)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d00eacf0892fa619433de39a63a06337ea29110..d5e10186c64220480e10df710fe48f4a7aca1226 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Adminer dev
 - Allow specifying operator in search anywhere
+- PostgreSQL 11-: Avoid duplicate oid in table status (bug #1089)
 - Plugins: Methods processList() and killProcess()
 
 ## Adminer 5.3.0 (released 2025-05-04)

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 0699858b25a9bbe1e4dc54d1432848ca3e30f26a..9d4e72235b3c49ce27d6851eda4792ec13bc14ef 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -452,11 +452,10 @@ ORDER BY 1";
        pg_indexes_size(oid) AS \"Index_length\"" : "") . ",
        obj_description(oid, 'pg_class') AS \"Comment\",
        " . (min_version(12) ? "''" : "CASE WHEN relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\",
-       reltuples as \"Rows\",
-       inhparent AS inherited,
+       reltuples AS \"Rows\",
+       (SELECT inhparent FROM pg_inherits WHERE inhrelid = oid) AS inherited,
        current_schema() AS nspname
 FROM pg_class
-LEFT JOIN pg_inherits ON inhrelid = oid
 WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
 AND relnamespace = " . driver()->nsOid . "
 " . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")) as $row //! Auto_increment