From 9d1451e6595651c0bde9dcd41eee3bff487a0712 Mon Sep 17 00:00:00 2001
From: Inoyatulloh <mronx@ya.ru>
Date: Sun, 8 Feb 2026 03:43:47 +0500
Subject: [PATCH] PostgreSQL: fix namespace in inheritance links

---
 CHANGELOG.md                   | 1 +
 adminer/drivers/pgsql.inc.php  | 4 ++--
 adminer/include/driver.inc.php | 4 ++--
 adminer/table.inc.php          | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e713e1a8..77d11246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - PostgreSQL: Add schema to sequence and and view export
 - PostgreSQL: Fix definition of complex generated columns
 - PostgreSQL: Mark unique partial indexes as unique (bug #1172)
+- PostgreSQL: fix namespace in inheritance links (bug #1221)
 - ClickHouse: Fix offset (bug #1188)
 - ClickHouse: Fix list of tables (bug #1176)
 - Plugins: Methods showVariables() and showStatus() (bug #1157)
diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index d11ab9bc..a7096275 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -334,11 +334,11 @@ if (isset($_GET["pgsql"])) {
 		}
 
 		function inheritsFrom(string $table): array {
-			return get_vals("SELECT relname FROM pg_class JOIN pg_inherits ON inhparent = oid WHERE inhrelid = " . $this->tableOid($table) . " ORDER BY 1");
+			return get_rows("SELECT relname AS table, nspname AS ns FROM pg_class JOIN pg_inherits ON inhparent = oid JOIN pg_namespace ON relnamespace = pg_namespace.oid WHERE inhrelid = " . $this->tableOid($table) . " ORDER BY 2, 1");
 		}
 
 		function inheritedTables(string $table): array {
-			return get_vals("SELECT relname FROM pg_inherits JOIN pg_class ON inhrelid = oid WHERE inhparent = " . $this->tableOid($table) . " ORDER BY 1");
+			return get_rows("SELECT relname AS table, nspname AS ns FROM pg_inherits JOIN pg_class ON inhrelid = oid JOIN pg_namespace ON relnamespace = pg_namespace.oid WHERE inhparent = " . $this->tableOid($table) . " ORDER BY 2, 1");
 		}
 
 		function partitionsInfo(string $table): array {
diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index 7222fe5b..5aa22fd9 100644
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -215,14 +215,14 @@ abstract class SqlDriver {
 	}
 
 	/** Get tables this table inherits from
-	* @return list<string>
+	* @return list<array{table: string, ns: string}>
 	*/
 	function inheritsFrom(string $table): array {
 		return array();
 	}
 
 	/** Get inherited tables
-	* @return list<string>
+	* @return list<array{table: string, ns: string}>
 	*/
 	function inheritedTables(string $table): array {
 		return array();
diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index b8a98a9f..dcbed5e4 100644
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -27,12 +27,13 @@ if ($fields) {
 }
 
 /** Print links to tables
-* @param list<string> $tables
+* @param list<array{table: string, ns: string}> $tables
 */
 function tables_links(array $tables): void {
 	echo "<ul>\n";
-	foreach ($tables as $table) {
-		echo "<li><a href='" . h(ME . "table=" . urlencode($table)) . "'>" . h($table) . "</a>";
+	foreach ($tables as $row) {
+		$link = preg_replace('~ns=[^&]*~', "ns=" . urlencode($row["ns"]), ME);
+		echo "<li><a href='" . h($link . "table=" . urlencode($row["table"])) . "'>" . ($row["ns"] != $_GET["ns"] ? "<b>" . h($row["ns"]) . "</b>." : "") . h($row["table"]) . "</a>";
 	}
 	echo "</ul>\n";
 }