From 485d005e751d4be5f43cda4b633490d755b5be94 Mon Sep 17 00:00:00 2001 From: pravesh-sharma Date: Thu, 26 Mar 2026 10:42:31 +0530 Subject: [PATCH 1/2] Fixed an issue where the Query tool kept prompting for a password when using a shared server. #9789 --- web/pgadmin/tools/sqleditor/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index f7cb83ba0c5..a8450ee93b5 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -513,6 +513,12 @@ def _init_sqleditor(trans_id, connect, sgid, sid, did, dbname=None, **kwargs): conn_id_ac = str(secrets.choice(range(1, 9999999))) server = Server.query.filter_by(id=sid).first() + if server.shared and server.user_id != current_user.id: + # Import here to avoid circular dependency + from pgadmin.browser.server_groups.servers import ServerModule + shared_server = ServerModule.get_shared_server(server, sgid) + server = ServerModule.get_shared_server_properties(server, + shared_server) manager = get_driver(PG_DEFAULT_DRIVER).connection_manager(sid) if kwargs.get('password', None) is None: From 1938e02091eb8db3ed30f1b3474b425baf003f4e Mon Sep 17 00:00:00 2001 From: pravesh-sharma Date: Thu, 26 Mar 2026 11:04:51 +0530 Subject: [PATCH 2/2] Fixed review comments --- web/pgadmin/tools/sqleditor/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index a8450ee93b5..fe69994f197 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -517,8 +517,9 @@ def _init_sqleditor(trans_id, connect, sgid, sid, did, dbname=None, **kwargs): # Import here to avoid circular dependency from pgadmin.browser.server_groups.servers import ServerModule shared_server = ServerModule.get_shared_server(server, sgid) - server = ServerModule.get_shared_server_properties(server, - shared_server) + if shared_server is not None: + server = ServerModule.get_shared_server_properties(server, + shared_server) manager = get_driver(PG_DEFAULT_DRIVER).connection_manager(sid) if kwargs.get('password', None) is None: