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

Added 'oid-2' to the ignore list of schema diff for all supported nodes. Fixes #5297

Browse Source
This commit is contained in:
Akshay Joshi 2020-03-27 15:27:48 +05:30
parent c002881f66
commit 86e4a88201
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
View File

@ -179,7 +179,7 @@ class DomainView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
'compare': [{'get': 'compare'}, {'get': 'compare'}] 'compare': [{'get': 'compare'}, {'get': 'compare'}]
}) })
keys_to_ignore = ['oid', 'basensp', 'conoid', 'nspname'] keys_to_ignore = ['oid', 'basensp', 'conoid', 'nspname', 'oid-2']
def validate_request(f): def validate_request(f):
""" """

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
View File

@ -221,7 +221,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
keys_to_ignore = ['oid', 'proowner', 'typnsp', 'xmin', 'prokind', keys_to_ignore = ['oid', 'proowner', 'typnsp', 'xmin', 'prokind',
'proisagg', 'pronamespace', 'proargdefaults', 'proisagg', 'pronamespace', 'proargdefaults',
'prorettype', 'proallargtypes', 'proacl'] 'prorettype', 'proallargtypes', 'proacl', 'oid-2']
@property @property
def required_args(self): def required_args(self):

2
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py
View File

@ -113,7 +113,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
'dependent': [{'get': 'dependents'}] 'dependent': [{'get': 'dependents'}]
}) })
keys_to_ignore = ['oid', 'schema', 'xmin'] keys_to_ignore = ['oid', 'schema', 'xmin', 'oid-2']
def check_precondition(action=None): def check_precondition(action=None):
""" """

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py
View File

@ -254,7 +254,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
# Schema Diff: Keys to ignore while comparing # Schema Diff: Keys to ignore while comparing
keys_to_ignore = ['oid', 'xmin', 'nspname', 'tfunction', keys_to_ignore = ['oid', 'xmin', 'nspname', 'tfunction',
'tgrelid', 'tgfoid'] 'tgrelid', 'tgfoid', 'oid-2']
def check_precondition(f): def check_precondition(f):
""" """

3
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py
View File

@ -233,8 +233,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
# Schema Diff: Keys to ignore while comparing # Schema Diff: Keys to ignore while comparing
keys_to_ignore = ['oid', 'relowner', 'schema', keys_to_ignore = ['oid', 'relowner', 'schema',
'indrelid', 'nspname' 'indrelid', 'nspname', 'oid-2']
]
def check_precondition(f): def check_precondition(f):
""" """

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py
View File

@ -223,7 +223,7 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings,
# Schema Diff: Keys to ignore while comparing # Schema Diff: Keys to ignore while comparing
keys_to_ignore = ['oid', 'schema', 'vacuum_table', keys_to_ignore = ['oid', 'schema', 'vacuum_table',
'vacuum_toast', 'edit_types'] 'vacuum_toast', 'edit_types', 'oid-2']
def get_children_nodes(self, manager, **kwargs): def get_children_nodes(self, manager, **kwargs):
nodes = [] nodes = []

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py
View File

@ -186,7 +186,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare):
}) })
# Schema Diff: Keys to ignore while comparing # Schema Diff: Keys to ignore while comparing
keys_to_ignore = ['oid', 'schema', 'definition'] keys_to_ignore = ['oid', 'schema', 'definition', 'oid-2']
def check_precondition(f): def check_precondition(f):
""" """

3
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py
View File

@ -251,7 +251,8 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
}) })
# Schema Diff: Keys to ignore while comparing # Schema Diff: Keys to ignore while comparing
keys_to_ignore = ['oid', 'xmin', 'nspname', 'tgrelid', 'tgfoid', 'prosrc'] keys_to_ignore = ['oid', 'xmin', 'nspname', 'tgrelid', 'tgfoid', 'prosrc',
'oid-2']
def check_precondition(f): def check_precondition(f):
""" """

2
web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py
View File

@ -220,7 +220,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
}) })
keys_to_ignore = ['oid', 'typnamespace', 'typrelid', 'typarray', 'alias', keys_to_ignore = ['oid', 'typnamespace', 'typrelid', 'typarray', 'alias',
'schema'] 'schema', 'oid-2']
def check_precondition(f): def check_precondition(f):
""" """

2
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
View File

@ -298,7 +298,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
{'get': 'get_toast_table_vacuum'}] {'get': 'get_toast_table_vacuum'}]
}) })
keys_to_ignore = ['oid', 'schema', 'xmin'] keys_to_ignore = ['oid', 'schema', 'xmin', 'oid-2']
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
""" """