Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default ServerGroup to user loading 0 Servers #6855

Merged
merged 7 commits into from
Oct 23, 2023
Merged

Add default ServerGroup to user loading 0 Servers #6855

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5325151
Add default ServerGroup to user loading 0 Servers
benjaminjb Oct 12, 2023
14e1da2
Fix too-long comment too, fix query length check
benjaminjb Oct 16, 2023
4777252
Merge branch 'master' into 6602-prevent-zero-servergroup-bug
benjaminjb Oct 16, 2023
62f2df9
Merge branch 'master' into 6602-prevent-zero-servergroup-bug
benjaminjb Oct 17, 2023
106ec87
skip deleting first server_group in clear_database_servers
benjaminjb Oct 17, 2023
a229c49
Add comment to server delete to match clear_database_servers comment
benjaminjb Oct 18, 2023
e403a3d
Merge branch 'master' into 6602-prevent-zero-servergroup-bug
benjaminjb Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions web/pgadmin/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,16 @@ def load_database_servers(input_file, selected_servers,

servers_added = servers_added + 1

# If `clear_database_servers` has dropped Servers and ServerGroups
# and if the file has an empty array for "Servers",
# recreate the default ServerGroup for this user just as if they were a new user.
# This prevents an issue where a user with 0 ServerGroups could not manually
# create new Servers and ServerGroups.
if len(groups) == 0 and len(data["Servers"]) == 0:
benjaminjb marked this conversation as resolved.
Show resolved Hide resolved
server_group = ServerGroup(user_id=user_id, name="Servers")
db.session.add(server_group)
db.session.commit()

msg = ADD_SERVERS_MSG % (groups_added, servers_added)
print(msg)

Expand All @@ -782,10 +792,6 @@ def clear_database_servers(load_user=current_user, from_setup=False):
groups = ServerGroup.query.filter_by(user_id=user_id)
for group in groups:
db.session.delete(group)
servers = Server.query.filter_by(user_id=user_id)

for server in servers:
db.session.delete(server)

try:
db.session.commit()
Expand Down