Skip to content

Commit 177b57d

Browse files
KijongHanclaude
andcommitted
fix(import-export): set username fallback to SharedUsername for shared servers
When loading database servers from an import file, fall back to SharedUsername for the underlying server.username when the server is shared and no explicit Username is provided. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent f7a95a7 commit 177b57d

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

web/pgadmin/utils/__init__.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,11 @@ def load_database_servers(input_file, selected_servers,
733733
groups_added = groups_added + 1
734734
groups = ServerGroup.query.filter_by(user_id=user_id)
735735

736+
is_shared = obj.get("Shared", None)
737+
username = obj.get("Username", None)
738+
if is_shared and not username:
739+
username = obj.get("SharedUsername", None)
740+
736741
# Create the server
737742
new_server = Server()
738743
new_server.name = obj["Name"]
@@ -744,7 +749,7 @@ def load_database_servers(input_file, selected_servers,
744749

745750
new_server.port = obj.get("Port", None)
746751

747-
new_server.username = obj.get("Username", None)
752+
new_server.username = username
748753

749754
new_server.role = obj.get("Role", None)
750755

@@ -798,7 +803,7 @@ def load_database_servers(input_file, selected_servers,
798803
new_server.tunnel_keep_alive = \
799804
obj.get("TunnelKeepAlive", None)
800805

801-
new_server.shared = obj.get("Shared", None)
806+
new_server.shared = is_shared
802807

803808
new_server.shared_username = obj.get("SharedUsername", None)
804809

0 commit comments

Comments
 (0)