diff --git a/docs/en_US/release_notes_5_0.rst b/docs/en_US/release_notes_5_0.rst index 80987ce57..9d546c346 100644 --- a/docs/en_US/release_notes_5_0.rst +++ b/docs/en_US/release_notes_5_0.rst @@ -19,6 +19,7 @@ Bug fixes | `Issue #5871 `_ - Ensure that username should be visible in the 'Connect to Server' popup when service and user name both specified. | `Issue #6045 `_ - Fixed autocomplete issue where it is not showing any suggestions if the schema name contains escape characters. +| `Issue #6087 `_ - Fixed an issue where the dependencies tab showing multiple owners for the objects having shared dependencies. | `Issue #6163 `_ - Fixed an issue where Zoom to fit button only works if the diagram is larger than the canvas. | `Issue #6164 `_ - Ensure that the diagram should not vanish entirely if zooming out too far in ERD. | `Issue #6179 `_ - Fixed an issue where Generate SQL displayed twice in the ERD tool. diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/gpdb/5_plus/role_dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/gpdb/5_plus/role_dependencies.sql index 25fc3f850..c3a3ba29c 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/gpdb/5_plus/role_dependencies.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/gpdb/5_plus/role_dependencies.sql @@ -1,4 +1,8 @@ SELECT rolname AS refname, refclassid, deptype FROM pg_shdepend dep LEFT JOIN pg_roles r ON refclassid=1260 AND refobjid=r.oid -{{where_clause}} ORDER BY 1 +{{where_clause}} +{% if db_name %} + AND dep.dbid = (SELECT oid FROM pg_database WHERE datname = '{{db_name}}') +{% endif %} +ORDER BY 1 diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/role_dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/role_dependencies.sql index 25fc3f850..c3a3ba29c 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/role_dependencies.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/role_dependencies.sql @@ -1,4 +1,8 @@ SELECT rolname AS refname, refclassid, deptype FROM pg_shdepend dep LEFT JOIN pg_roles r ON refclassid=1260 AND refobjid=r.oid -{{where_clause}} ORDER BY 1 +{{where_clause}} +{% if db_name %} + AND dep.dbid = (SELECT oid FROM pg_database WHERE datname = '{{db_name}}') +{% endif %} +ORDER BY 1 diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/role_dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/role_dependencies.sql index 25fc3f850..c3a3ba29c 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/role_dependencies.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/role_dependencies.sql @@ -1,4 +1,8 @@ SELECT rolname AS refname, refclassid, deptype FROM pg_shdepend dep LEFT JOIN pg_roles r ON refclassid=1260 AND refobjid=r.oid -{{where_clause}} ORDER BY 1 +{{where_clause}} +{% if db_name %} + AND dep.dbid = (SELECT oid FROM pg_database WHERE datname = '{{db_name}}') +{% endif %} +ORDER BY 1 diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index 20f4915b4..7b98d9d7c 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -490,7 +490,7 @@ class PGChildNodeView(NodeView): if where_clause.find('subid') < 0: sql = render_template( "/".join([sql_path, 'role_dependencies.sql']), - where_clause=where_clause) + where_clause=where_clause, db_name=conn.db) status, result = conn.execute_dict(sql) if not status: