PostgreSQL: Show only accessible databases

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 198e642945a764f03e51cf21e98648fc35a3c833..80f5b13e53b225a8f2a9be6eed7b50cce733a94a 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -274,7 +274,9 @@ if (isset($_GET["pgsql"])) {
        }
 
        function get_databases() {
-               return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
+               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");
        }
 
        function limit($query, $where, $limit, $offset = 0, $separator = " ") {

diff --git a/changes.txt b/changes.txt
index 8bceca72d51307e01eb066dde31120a553d60b0a..e2daeed1e52fb1a0f6fa364042dd09c05c1ccb96 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 4.9.1-dev:
 Support PHP 8.3
+PostgreSQL: Show only accessible databases
 
 Adminer 4.9.0:
 Validate connection to server in HTTP based drivers