IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where the ignore owner flag is not working for some cases in the Schema Diff. #5622, #5655

Browse Source
This commit is contained in:
Nikhil Mohite 2023-01-02 13:00:55 +05:30 committed by GitHub
parent d1a9406bff
commit 18a7e85c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/tools/schema_diff/directory_compare.py
View File

@ -292,7 +292,7 @@ def _get_identical_and_different_list(intersect_keys, source_dict, target_dict,
# Add submodules into the ignore keys so that directory
# difference won't include those in added, deleted and changed
sub_module = ['index', 'rule', 'trigger', 'compound_trigger']
temp_ignore_keys = view_object.keys_to_ignore + sub_module
temp_ignore_keys = ignore_keys + sub_module
diff_dict = directory_diff(
dict1[key], dict2[key],
@ -421,8 +421,8 @@ def compare_dictionaries(**kwargs):
# ignore keys.
if ignore_owner:
owner_keys = ['owner', 'eventowner', 'funcowner', 'fdwowner',
'fsrvowner', 'lanowner', 'relowner', 'seqowner',
'typeowner']
'fsrvowner', 'lanowner', 'relowner', 'relacl', 'acl',
'seqowner', 'typeowner']
ignore_keys = ignore_keys + owner_keys
# Compare the values of duplicates keys.

1
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx
View File

@ -310,7 +310,6 @@ export function SchemaDiffCompare({ params }) {
} catch (error) {
setLoaderText(null);
setShowResultGrid(false);
console.error(error);
Notifier.alert(gettext('Error'), parseApiError(error));
}
socket?.disconnect();