From 7504f6216a9986899c98499e2e41203da0674c99 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Thu, 29 May 2025 19:08:56 +0530 Subject: [PATCH] Fixed an issue where the Schema Diff Tool incorrectly reported differences due to variations in the order of the privileges. #8032 --- docs/en_US/release_notes_9_5.rst | 1 + web/pgadmin/browser/server_groups/servers/utils.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docs/en_US/release_notes_9_5.rst b/docs/en_US/release_notes_9_5.rst index e1f67be34..1aa40d52f 100644 --- a/docs/en_US/release_notes_9_5.rst +++ b/docs/en_US/release_notes_9_5.rst @@ -28,3 +28,4 @@ Housekeeping Bug fixes ********* + | `Issue #8032 `_ - Fixed an issue where the Schema Diff Tool incorrectly reported differences due to variations in the order of the privileges. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/utils.py b/web/pgadmin/browser/server_groups/servers/utils.py index 32fc72362..604bc2795 100644 --- a/web/pgadmin/browser/server_groups/servers/utils.py +++ b/web/pgadmin/browser/server_groups/servers/utils.py @@ -54,6 +54,9 @@ def parse_priv_from_db(db_privileges): "with_grant": db_privileges['grantable'][idx] }) + # Sort the privileges based on the privilege_type to fix + # a Schema Diff issue. + privileges.sort(key=lambda x: x['privilege_type']) acl['privileges'] = privileges return acl