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

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

@@ -179,7 +179,7 @@ class DomainView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
         '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):
         """

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

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

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

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

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

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

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

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

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

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

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

@@ -186,7 +186,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare):
     })
 
     # 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):
         """

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

@@ -251,7 +251,8 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
     })
 
     # 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):
         """

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

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

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

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