From 57ed02a9aa137d170e8fbf675366cb490276af82 Mon Sep 17 00:00:00 2001 From: Nikhil Mohite Date: Thu, 21 Jan 2021 14:23:02 +0530 Subject: [PATCH] Fixed an issue where shared server entries not getting deleted from SQLite database if the user gets deleted. Fixes #6143 --- docs/en_US/release_notes_4_30.rst | 1 + web/pgadmin/tools/user_management/__init__.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/en_US/release_notes_4_30.rst b/docs/en_US/release_notes_4_30.rst index b354dd6e7..7f23afdc7 100644 --- a/docs/en_US/release_notes_4_30.rst +++ b/docs/en_US/release_notes_4_30.rst @@ -52,4 +52,5 @@ Bug fixes | `Issue #6122 `_ - Added informative message when there is no difference found for schema diff. | `Issue #6128 `_ - Fixed an issue where sequences are not created. | `Issue #6140 `_ - Ensure that verbose logs should be visible for Utility(Backup, Maintenance) jobs. +| `Issue #6143 `_ - Fixed an issue where shared server entries not getting deleted from SQLite database if the user gets deleted. | `Issue #6144 `_ - Ensure that the current value of the sequence should be ignored while comparing using schema diff. diff --git a/web/pgadmin/tools/user_management/__init__.py b/web/pgadmin/tools/user_management/__init__.py index ce280a3d2..649c50db6 100644 --- a/web/pgadmin/tools/user_management/__init__.py +++ b/web/pgadmin/tools/user_management/__init__.py @@ -28,7 +28,7 @@ from pgadmin.utils.constants import MIMETYPE_APP_JS, INTERNAL,\ SUPPORTED_AUTH_SOURCES, KERBEROS from pgadmin.utils.validation_utils import validate_email from pgadmin.model import db, Role, User, UserPreference, Server, \ - ServerGroup, Process, Setting + ServerGroup, Process, Setting, SharedServer # set template path for sql scripts MODULE_NAME = 'user_management' @@ -347,6 +347,8 @@ def delete(uid): Process.query.filter_by(user_id=uid).delete() + SharedServer.query.filter_by(user_id=uid).delete() + # Finally delete user db.session.delete(usr)