From ac8318f387e77d2e22742263acbb9eb20f82a351 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 27 May 2025 11:09:31 +0200 Subject: [PATCH] PostgreSQL 11-: Avoid duplicate oid in table status (fix #1089) --- CHANGELOG.md | 1 + adminer/drivers/pgsql.inc.php | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d00eacf..d5e10186 100644 --- 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 0699858b..9d4e7223 100644 --- 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