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

Ensure that OID should be shown in properties for Synonyms. Fixes #5270

Browse Source
This commit is contained in:
Khushboo Vashi
2020-04-10 13:19:52 +05:30
committed by Akshay Joshi
parent c8646f99c0
commit e238ecf182
14 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,9 +53,6 @@ def compare_dictionaries(view_object, source_params, target_params,
source_object_id = None
if 'oid' in source_dict[item]:
source_object_id = source_dict[item]['oid']
elif 'name' in source_dict[item]:
# For synonyms use name as OID
source_object_id = source_dict[item]['name']
if node == 'table':
temp_src_params = copy.deepcopy(source_params)
@@ -96,9 +93,6 @@ def compare_dictionaries(view_object, source_params, target_params,
target_object_id = None
if 'oid' in target_dict[item]:
target_object_id = target_dict[item]['oid']
elif 'name' in target_dict[item]:
# For synonyms use name as OID
target_object_id = target_dict[item]['name']
if node == 'table':
temp_tgt_params = copy.deepcopy(target_params)
@@ -140,10 +134,6 @@ def compare_dictionaries(view_object, source_params, target_params,
if 'oid' in source_dict[key]:
source_object_id = source_dict[key]['oid']
target_object_id = target_dict[key]['oid']
elif 'name' in target_dict[key]:
# For synonyms use name as OID
source_object_id = source_dict[key]['name']
target_object_id = target_dict[key]['name']
# Recursively Compare the two dictionary
if are_dictionaries_identical(dict1[key], dict2[key], ignore_keys):