Ensure objects depending on extensions are not displayed in Schema Diff. Fixes #7221

docs/en_US/release_notes_6_8.rst

@@ -21,6 +21,7 @@ Bug fixes
 
   | `Issue #7059 <https://redmine.postgresql.org/issues/7059>`_ -  Fixed an issue where the error is shown on logout when the authentication source is oauth2.
   | `Issue #7216 <https://redmine.postgresql.org/issues/7216>`_ -  Ensure that the values of certain fields are prettified in the statistics tab for collection nodes.
+  | `Issue #7221 <https://redmine.postgresql.org/issues/7221>`_ -  Ensure objects depending on extensions are not displayed in Schema Diff.
   | `Issue #7238 <https://redmine.postgresql.org/issues/7238>`_ -  Fixed an issue where foreign key is not removed even if the referred table is removed in ERD.
   | `Issue #7257 <https://redmine.postgresql.org/issues/7257>`_ -  Support running the container under OpenShift with alternate UIDs.
   | `Issue #7261 <https://redmine.postgresql.org/issues/7261>`_ -  Correct typo in the documentation.

web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py

@@ -774,9 +774,10 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
             last_system_oid = (self.manager.db_info[did])['datlastsysoid']
 
         sql = render_template(
-            "/".join([self.template_path, 'nodes.sql']),
+            "/".join([self.template_path, self._NODES_SQL]),
             datlastsysoid=last_system_oid,
-            showsysobj=self.blueprint.show_system_objects
+            showsysobj=self.blueprint.show_system_objects,
+            schema_diff=True
         )
         status, rset = self.conn.execute_2darray(sql)
         if not status:

web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/nodes.sql

@@ -21,4 +21,8 @@
         {% endif %}
         ca.oid > {{datlastsysoid}}::OID
     {% endif %}
+    {% if schema_diff %}
+        AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+            WHERE objid = ca.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+    {% endif %}
     ORDER BY st.typname, tt.typname

web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py

@@ -853,14 +853,9 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
 
-        last_system_oid = 0
-        if self.manager.db_info is not None and did in self.manager.db_info:
-            last_system_oid = (self.manager.db_info[did])['datlastsysoid']
-
         sql = render_template(
-            "/".join([self.template_path, 'nodes.sql']),
+            "/".join([self.template_path, self._NODES_SQL]),
-            datlastsysoid=last_system_oid,
+            schema_diff=True
-            showsysobj=self.blueprint.show_system_objects
         )
         status, rset = self.conn.execute_2darray(sql)
         if not status:

web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/sql/9.3_plus/nodes.sql

@@ -3,4 +3,8 @@ FROM pg_catalog.pg_event_trigger e
 {% if etid %}
 WHERE e.oid={{etid}}::oid
 {% endif %}
+{% if schema_diff %}
+WHERE CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+    WHERE objid = e.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY e.evtname

web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py

@@ -561,7 +561,7 @@ class ExtensionView(PGChildNodeView, SchemaDiffObjectCompare):
         res = dict()
 
         sql = render_template("/".join([self.template_path,
-                                        'properties.sql']))
+                                        self._PROPERTIES_SQL]))
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=rset)

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py

@@ -963,7 +963,8 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare):
         res = dict()
 
         sql = render_template("/".join([self.template_path,
-                                        'properties.sql']))
+                                        self._PROPERTIES_SQL]),
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=rset)

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py

@@ -924,7 +924,8 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare):
         res = dict()
 
         sql = render_template("/".join([self.template_path,
-                                        'properties.sql']))
+                                        self._PROPERTIES_SQL]),
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=rset)

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/9.3_plus/properties.sql

@@ -22,5 +22,9 @@ WHERE srvfdw={{fid}}::oid
 {% if fsid %}
 WHERE srv.oid={{fsid}}::oid
 {% endif %}
+{% if schema_diff %}
+WHERE CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+    WHERE objid = srv.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY srvname;
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py

@@ -548,7 +548,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         try:
             sql = render_template("/".join([self.template_path,
-                                            'properties.sql']),
+                                            self._PROPERTIES_SQL]),
                                   umid=umid, conn=self.conn)
             status, res = self.conn.execute_dict(sql)
             if not status:
@@ -905,7 +905,8 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
         res = dict()
 
         sql = render_template("/".join([self.template_path,
-                                        'properties.sql']))
+                                        self._PROPERTIES_SQL]),
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=rset)

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/properties.sql

@@ -14,5 +14,9 @@ ORDER BY 2;
 SELECT u.umid AS oid, u.usename AS name, u.srvid AS fsid, pg_catalog.array_to_string(u.umoptions, ',') AS umoptions, fs.srvfdw AS fdwid
 FROM pg_catalog.pg_user_mappings u
 LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid = u.srvid
+{% if schema_diff %}
+WHERE CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+    WHERE objid = u.umid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY 2;
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/9.3_plus/properties.sql

@@ -23,4 +23,8 @@ WHERE fdw.oid={{fid}}::oid
 {% if fname %}
 WHERE fdw.fdwname={{ fname|qtLiteral }}::text
 {% endif %}
+{% if schema_diff %}
+WHERE CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+    WHERE objid = fdw.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY fdwname

web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py

@@ -829,7 +829,8 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         sql = render_template("/".join([self.template_path,
-                                        'properties.sql']))
+                                        self._PROPERTIES_SQL]),
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=rset)

web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/default/properties.sql

@@ -20,4 +20,8 @@ WHERE lanispl IS TRUE
 {% if lanname %} AND
     lanname={{ lanname|qtLiteral }}::text
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = lan.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY lanname

web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py

@@ -292,7 +292,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = []
         sql = render_template("/".join([self.template_path,
-                                        'nodes.sql']))
+                                        self._NODES_SQL]))
         status, result = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=result)
@@ -900,14 +900,9 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
         if self.manager.version < 100000:
             return res
 
-        last_system_oid = 0
-        if self.manager.db_info is not None and did in self.manager.db_info:
-            last_system_oid = (self.manager.db_info[did])['datlastsysoid']
-
         sql = render_template(
-            "/".join([self.template_path, 'nodes.sql']),
+            "/".join([self.template_path, self._NODES_SQL]),
-            datlastsysoid=last_system_oid,
+            schema_diff=True
-            showsysobj=self.blueprint.show_system_objects
         )
         status, rset = self.conn.execute_2darray(sql)
         if not status:

web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/sql/default/nodes.sql

@@ -1 +1,6 @@
-SELECT oid , pubname AS name FROM pg_catalog.pg_publication;
+SELECT oid , pubname AS name
+FROM pg_catalog.pg_publication
+{% if schema_diff %}
+WHERE CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+    WHERE objid = oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}

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

@@ -799,7 +799,8 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/nodes.sql

@@ -5,4 +5,8 @@ WHERE c.collnamespace = {{scid}}::oid
 {% elif coid %}
 WHERE c.oid = {{coid}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY c.collname;

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

@@ -831,7 +831,7 @@ AND relkind != 'c'))"""
                 data['is_schema_diff'] = True
 
             SQL = render_template(
-                "/".join([self.template_path, 'update.sql']),
+                "/".join([self.template_path, self._UPDATE_SQL]),
                 data=data, o_data=old_data)
         return SQL, data
 
@@ -935,7 +935,8 @@ AND relkind != 'c'))"""
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODE_SQL]), scid=scid)
+                                        self._NODE_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=rset)

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/9.2_plus/node.sql

@@ -13,5 +13,9 @@ WHERE
 {% elif doid %}
 WHERE d.oid = {{doid}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = d.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     d.typname;

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

@@ -1542,7 +1542,8 @@ class ForeignTableView(PGChildNodeView, DataTypeReader,
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODE_SQL]), scid=scid)
+                                        self._NODE_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/node.sql

@@ -15,4 +15,8 @@ WHERE
 {% elif foid %}
     c.oid = {{foid}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY c.relname;

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

@@ -943,7 +943,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare):
                 data = {'schema': scid}
                 # Fetch schema name from schema oid
                 sql = render_template("/".join([self.template_path,
-                                                'schema.sql']),
+                                                self._SCHEMA_SQL]),
                                       data=data,
                                       conn=self.conn,
                                       )
@@ -1014,7 +1014,8 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, fts_cfg = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/nodes.sql

@@ -9,5 +9,9 @@ WHERE
 {% elif cfgid %}
     cfg.oid = {{cfgid}}::OID
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = cfg.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 
 ORDER BY name

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

@@ -922,7 +922,8 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/nodes.sql

@@ -10,5 +10,8 @@ WHERE
 {% elif dcid %}
     dict.oid = {{dcid}}::OID
 {% endif %}
-
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = dict.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY name

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

@@ -888,7 +888,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
                 data = {'schema': scid}
                 # Fetch schema name from schema oid
                 sql = render_template("/".join([self.template_path,
-                                                'schema.sql']),
+                                                self._SCHEMA_SQL]),
                                       data=data,
                                       conn=self.conn,
                                       )
@@ -959,7 +959,8 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/nodes.sql

@@ -9,5 +9,8 @@ WHERE
 {% elif pid %}
     prs.oid = {{pid}}::OID
 {% endif %}
-
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = prs.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY name

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

@@ -765,7 +765,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
             data = {'schema': scid}
             # Fetch schema name from schema oid
             sql = render_template("/".join([self.template_path,
-                                            'schema.sql']),
+                                            self._SCHEMA_SQL]),
                                   data=data,
                                   conn=self.conn,
                                   )
@@ -832,7 +832,8 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         SQL = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/nodes.sql

@@ -8,5 +8,8 @@ WHERE
 {% elif tid %}
     tmpl.oid = {{tid}}::OID
 {% endif %}
-
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = tmpl.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY name

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

@@ -1960,7 +1960,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
 
         if not oid:
             sql = render_template("/".join([self.sql_template_path,
-                                            self._NODE_SQL]), scid=scid)
+                                            self._NODE_SQL]), scid=scid,
+                                  schema_diff=True)
             status, rset = self.conn.execute_2darray(sql)
             if not status:
                 return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql

@@ -16,6 +16,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql

@@ -16,6 +16,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql

@@ -17,6 +17,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql

@@ -17,6 +17,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/node.sql

@@ -23,6 +23,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql

@@ -23,6 +23,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql

@@ -24,6 +24,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname NOT IN ('trigger', 'event_trigger')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/node.sql

@@ -16,6 +16,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname IN ('trigger', 'event_trigger')
     AND lanname NOT IN ('edbspl', 'sql', 'internal')

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/node.sql

@@ -17,6 +17,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND lanname NOT IN ('edbspl', 'sql', 'internal')
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/node.sql

@@ -16,6 +16,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname IN ('trigger', 'event_trigger')
     AND lanname NOT IN ('edbspl', 'sql', 'internal')

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/node.sql

@@ -16,6 +16,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname IN ('trigger', 'event_trigger') AND lanname != 'edbspl'
 ORDER BY

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/node.sql

@@ -16,6 +16,10 @@ WHERE
 {% endif %}
 {% if scid %}
     AND pronamespace = {{scid}}::oid
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     AND typname IN ('trigger', 'event_trigger')
     AND lanname NOT IN ('edbspl', 'sql', 'internal')

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

@@ -830,7 +830,8 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
             return res
 
         sql = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/nodes.sql

@@ -6,6 +6,10 @@ WHERE nspparent = {{scid}}::oid
 {% if pkgid %}
 AND nsp.oid = {{pkgid}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = nsp.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 AND nspobjecttype = 0
 AND nspcompoundtrigger = false
 ORDER BY nspname;

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/nodes.sql

@@ -6,4 +6,8 @@ WHERE nspparent = {{scid}}::oid
 {% if pkgid %}
 AND nsp.oid = {{pkgid}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = nsp.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY nspname;

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/nodes.sql

@@ -6,5 +6,9 @@ WHERE nspparent = {{scid}}::oid
 {% if pkgid %}
 AND nsp.oid = {{pkgid}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = nsp.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 AND nspobjecttype = 0
 ORDER BY nspname;

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

@@ -937,7 +937,8 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = dict()
         sql = render_template("/".join([self.template_path,
-                                        self._NODES_SQL]), scid=scid)
+                                        self._NODES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/nodes.sql

@@ -11,4 +11,8 @@ WHERE
 {% if seid %}
     AND cl.oid = {{seid|qtLiteral}}::oid
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = cl.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY relname

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

@@ -758,7 +758,8 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare):
             return res
 
         SQL = render_template("/".join([self.template_path,
-                                        self._PROPERTIES_SQL]), scid=scid)
+                                        self._PROPERTIES_SQL]), scid=scid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.2_plus/properties.sql

@@ -27,4 +27,8 @@ FROM pg_catalog.pg_synonym s  JOIN pg_catalog.pg_namespace ns ON s.synnamespace
  {% if syid %}
    AND s.oid={{syid}}::oid
  {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = s.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY synname;

web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/properties.sql

@@ -27,4 +27,8 @@ FROM pg_catalog.pg_synonym s  JOIN pg_catalog.pg_namespace ns ON s.synnamespace
  {% if syid %}
    AND s.oid={{syid}}::oid
  {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = s.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY synname;

web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/properties.sql

@@ -15,4 +15,8 @@ FROM pg_catalog.pg_synonym s  JOIN pg_catalog.pg_namespace ns ON s.synnamespace
  {% if syid %}
    AND s.oid={{syid}}::oid
  {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = s.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY synname;

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

@@ -973,7 +973,8 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
             res = data
         else:
             SQL = render_template("/".join([self.template_path,
-                                            self._NODES_SQL]), tid=tid)
+                                            self._NODES_SQL]), tid=tid,
+                                  schema_diff=True)
             status, triggers = self.conn.execute_2darray(SQL)
             if not status:
                 current_app.logger.error(triggers)

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

@@ -1028,7 +1028,8 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
 
         if not oid:
             SQL = render_template("/".join([self.template_path,
-                                            self._NODES_SQL]), tid=tid)
+                                            self._NODES_SQL]), tid=tid,
+                                  schema_diff=True)
             status, indexes = self.conn.execute_2darray(SQL)
             if not status:
                 current_app.logger.error(indexes)

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

@@ -420,7 +420,7 @@ class PartitionsView(BaseTableView, DataTypeReader, SchemaDiffObjectCompare):
         else:
             SQL = render_template(
                 "/".join([self.partition_template_path, self._NODES_SQL]),
-                scid=scid, tid=tid
+                scid=scid, tid=tid, schema_diff=True
             )
             status, partitions = self.conn.execute_2darray(SQL)
             if not status:

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

@@ -660,7 +660,8 @@ class RowSecurityView(PGChildNodeView):
 
         if not oid:
             SQL = render_template("/".join([self.template_path,
-                                            self._NODES_SQL]), tid=tid)
+                                            self._NODES_SQL]), tid=tid,
+                                  schema_diff=True)
             status, policies = self.conn.execute_2darray(SQL)
             if not status:
                 current_app.logger.error(policies)

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

@@ -644,7 +644,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare):
         else:
             SQL = render_template("/".join([self.template_path,
                                             self._NODES_SQL]),
-                                  tid=tid)
+                                  tid=tid, schema_diff=True)
             status, rules = self.conn.execute_2darray(SQL)
             if not status:
                 current_app.logger.error(rules)

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/nodes.sql

@@ -6,5 +6,9 @@ FROM pg_catalog.pg_trigger t
     AND tgpackageoid != 0
 {% if trid %}
     AND t.oid = {{trid}}::OID
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     ORDER BY tgname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql

@@ -12,5 +12,9 @@ WHERE indrelid = {{tid}}::OID
     AND conname is NULL
 {% if idx %}
     AND cls.oid = {{ idx }}::OID
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = cls.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     ORDER BY cls.relname

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/nodes.sql

@@ -41,4 +41,8 @@ FROM
     LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid
     WHERE rel.relispartition
     {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
     ORDER BY rel.relname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/nodes.sql

@@ -41,4 +41,8 @@ FROM
     LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid
     WHERE rel.relispartition
     {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
     ORDER BY rel.relname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/row_security_policies/sql/9.5_plus/nodes.sql

@@ -9,5 +9,9 @@ WHERE
 {% elif plid %}
     pl.oid = {{ plid }}
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pl.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     pl.polname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/row_security_policies/sql/default/nodes.sql

@@ -9,5 +9,9 @@ WHERE
 {% elif plid %}
     pl.oid = {{ plid }}
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = pl.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     pl.polname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/rules/sql/nodes.sql

@@ -12,5 +12,9 @@ WHERE
 {% elif rid %}
     rw.oid = {{ rid }}
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = rw.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     rw.rulename

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/nodes.sql

@@ -8,4 +8,8 @@ FROM pg_catalog.pg_class rel
     WHERE rel.relkind IN ('r','s','t','p') AND rel.relnamespace = {{ scid }}::oid
     AND NOT rel.relispartition
     {% if tid %} AND rel.oid = {{tid}}::OID {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
     ORDER BY rel.relname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/nodes.sql

@@ -6,4 +6,8 @@ SELECT rel.oid, rel.relname AS name,
 FROM pg_catalog.pg_class rel
     WHERE rel.relkind IN ('r','s','t') AND rel.relnamespace = {{ scid }}::oid
     {% if tid %} AND rel.oid = {{tid}}::OID {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
     ORDER BY rel.relname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/9.1_plus/nodes.sql

@@ -4,5 +4,9 @@ FROM pg_catalog.pg_trigger t
     AND tgrelid = {{tid}}::OID
 {% if trid %}
     AND t.oid = {{trid}}::OID
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     ORDER BY tgname;

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/9.1_plus/nodes.sql

@@ -4,5 +4,9 @@ FROM pg_catalog.pg_trigger t
     AND tgrelid = {{tid}}::OID
 {% if trid %}
     AND t.oid = {{trid}}::OID
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
 {% endif %}
     ORDER BY tgname;

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

@@ -1027,7 +1027,8 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
             res = data
         else:
             SQL = render_template("/".join([self.template_path,
-                                            self._NODES_SQL]), tid=tid)
+                                            self._NODES_SQL]), tid=tid,
+                                  schema_diff=True)
             status, triggers = self.conn.execute_2darray(SQL)
             if not status:
                 current_app.logger.error(triggers)

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py

@@ -511,7 +511,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable, VacuumSettings):
         else:
             res = dict()
             sql = render_template("/".join([self.table_template_path,
-                                            self._NODES_SQL]), scid=scid)
+                                            self._NODES_SQL]), scid=scid,
+                                  schema_diff=True)
             status, tables = self.conn.execute_2darray(sql)
             if not status:
                 return False, tables

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

@@ -1551,7 +1551,8 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
         res = dict()
         SQL = render_template("/".join([self.template_path,
                                         self._NODES_SQL]),
-                              scid=scid, datlastsysoid=self.datlastsysoid)
+                              scid=scid, datlastsysoid=self.datlastsysoid,
+                              schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/nodes.sql

@@ -10,4 +10,8 @@ WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' AND t.typnamespace = {{sci
 {% if not show_system_objects %}
     AND ct.oid is NULL
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY t.typname;

web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/nodes.sql

@@ -10,4 +10,8 @@ WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' AND t.typnamespace = {{sci
 {% if not show_system_objects %}
     AND ct.oid is NULL
 {% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY t.typname;

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

@@ -1653,7 +1653,8 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
         if not oid:
             SQL = render_template("/".join(
                 [self.template_path, self._SQL_PREFIX + self._NODES_SQL]),
-                did=did, scid=scid, datlastsysoid=self.datlastsysoid)
+                did=did, scid=scid, datlastsysoid=self.datlastsysoid,
+                schema_diff=True)
             status, views = self.conn.execute_2darray(SQL)
             if not status:
                 current_app.logger.error(views)
@@ -2286,7 +2287,8 @@ class MViewNode(ViewNode, VacuumSettings):
         res = dict()
         SQL = render_template("/".join(
             [self.template_path, self._SQL_PREFIX + self._NODES_SQL]),
-            did=did, scid=scid, datlastsysoid=self.datlastsysoid)
+            did=did, scid=scid, datlastsysoid=self.datlastsysoid,
+            schema_diff=True)
         status, rset = self.conn.execute_2darray(SQL)
         if not status:
             return internal_server_error(errormsg=res)

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/nodes.sql

@@ -8,6 +8,10 @@ WHERE
     AND c.oid = {{vid}}::oid
 {% elif scid %}
     AND c.relnamespace = {{scid}}::oid
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = c.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}
 ORDER BY
     c.relname
 {% endif %}

web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py

@@ -280,7 +280,7 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare):
         """
         res = []
         sql = render_template("/".join([self.template_path,
-                                        'nodes.sql']), did=did)
+                                        self._NODES_SQL]), did=did)
         status, result = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=result)
@@ -883,15 +883,9 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare):
         if self.manager.version < 100000:
             return res
 
-        last_system_oid = 0
-        if self.manager.db_info is not None and did in self.manager.db_info:
-            last_system_oid = (self.manager.db_info[did])['datlastsysoid']
-
         sql = render_template(
-            "/".join([self.template_path, 'nodes.sql']),
+            "/".join([self.template_path, self._NODES_SQL]),
-            datlastsysoid=last_system_oid,
+            did=did, schema_diff=True
-            showsysobj=self.blueprint.show_system_objects,
-            did=did
         )
         status, rset = self.conn.execute_2darray(sql)
         if not status:

web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/nodes.sql

@@ -3,5 +3,9 @@ WHERE
 {% if subid %}
     sub.oid = {{ subid }};
 {% else %}
-    sub.subdbid = {{ did }};
+    sub.subdbid = {{ did }}
-{% endif %};
+{% endif %}
+{% if schema_diff %}
+    AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend
+        WHERE objid = oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END
+{% endif %}

web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py

@@ -276,7 +276,7 @@ class ResourceGroupView(NodeView):
             sid: Server ID
         """
 
-        sql = render_template("/".join([self.sql_path, 'nodes.sql']),
+        sql = render_template("/".join([self.sql_path, self._NODES_SQL]),
                               rgid=rg_id)
         status, result = self.conn.execute_2darray(sql)
         if not status:
@@ -308,7 +308,7 @@ class ResourceGroupView(NodeView):
             sid: Server ID
         """
         res = []
-        sql = render_template("/".join([self.sql_path, 'nodes.sql']))
+        sql = render_template("/".join([self.sql_path, self._NODES_SQL]))
         status, result = self.conn.execute_2darray(sql)
         if not status:
             return internal_server_error(errormsg=result)
@@ -549,7 +549,7 @@ class ResourceGroupView(NodeView):
             for rg_id in data['ids']:
                 # Get name for resource group from rg_id
                 sql = render_template(
-                    "/".join([self.sql_path, 'delete.sql']),
+                    "/".join([self.sql_path, self._DELETE_SQL]),
                     rgid=rg_id, conn=self.conn
                 )
                 status, rgname = self.conn.execute_scalar(sql)
@@ -570,7 +570,7 @@ class ResourceGroupView(NodeView):
 
                 # drop resource group
                 sql = render_template(
-                    "/".join([self.sql_path, 'delete.sql']),
+                    "/".join([self.sql_path, self._DELETE_SQL]),
                     rgname=rgname, conn=self.conn
                 )
                 status, res = self.conn.execute_scalar(sql)