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

Fixed an issue where the Database restriction is not working. Fixes #7453

Browse Source
This commit is contained in:
Nikhil Mohite
2022-06-09 17:03:21 +05:30
committed by Akshay Joshi
parent e1c5a06bf0
commit fd1f71587f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_11.rst
View File

@@ -19,3 +19,4 @@ Housekeeping
Bug fixes Bug fixes
********* *********
| `Issue #7411 <https://redmine.postgresql.org/issues/7411>`_ - Fixed an issue where the Database restriction is not working.

7
web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/nodes.sql
View File

@@ -5,13 +5,14 @@ FROM
pg_catalog.pg_database db pg_catalog.pg_database db
LEFT OUTER JOIN pg_catalog.pg_tablespace ta ON db.dattablespace = ta.oid LEFT OUTER JOIN pg_catalog.pg_tablespace ta ON db.dattablespace = ta.oid
WHERE {% if did %} WHERE {% if did %}
db.oid = {{ did|qtLiteral }}::OID{% else %} db.oid = {{ did|qtLiteral }}::OID
db.oid > {{ last_system_oid }}::OID OR db.datname IN ('postgres', 'edb')
{% endif %} {% endif %}
{% if db_restrictions %} {% if db_restrictions %}
AND {% if did %}AND{% endif %}
db.datname in ({{db_restrictions}}) db.datname in ({{db_restrictions}})
{% elif not did%}
db.oid > {{ last_system_oid }}::OID OR db.datname IN ('postgres', 'edb')
{% endif %} {% endif %}
{% if show_system_objects %} {% if show_system_objects %}