From 17939b56c45e3b80c3a75c88ed4343a179dee29f Mon Sep 17 00:00:00 2001 From: jfonsato Date: Mon, 3 Mar 2025 15:03:25 +0100 Subject: [PATCH] PostgreSQL: Show only accessible databases --- adminer/drivers/pgsql.inc.php | 6 +++--- changes.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 0a54ee21..7328a603 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -291,9 +291,9 @@ if (isset($_GET["pgsql"])) { } function get_databases() { - return get_vals("SELECT d.datname FROM pg_database d JOIN pg_roles r ON d.datdba = r.oid -WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE') -ORDER BY d.datname"); + return get_vals("SELECT datname FROM pg_database +WHERE datallowconn = TRUE AND has_database_privilege(datname, 'CONNECT') +ORDER BY datname"); } function limit($query, $where, $limit, $offset = 0, $separator = " ") { diff --git a/changes.txt b/changes.txt index 92bfc160..e3c66f57 100644 --- a/changes.txt +++ b/changes.txt @@ -5,6 +5,7 @@ PostgreSQL: Do not alter indexes with expressions PostgreSQL: Fix export of indexes with expressions (bug #768) PostgreSQL: Display ENUM types PostgreSQL: Export ENUM types (bug #587) +PostgreSQL: Show accessible databases to non-owners (regression from 4.9.1) SQLite: Support CHECK constraint SQLite: Add command Check tables SQLite: Display all rows of variable values