diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js index 88a181962..9d89b51b2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js @@ -227,6 +227,9 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) { id: 'datowner', label:'{{ _('Owner') }}', editable: false, type: 'text', node: 'role', control: Backform.NodeListByNameControl + },{ + id: 'acl', label: '{{ _('Privileges') }}', type: 'text', + mode: ['properties'], disabled: true },{ id: 'comments', label:'{{ _('Comment') }}', editable: false, type: 'multiline' diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql index 0d241cdc2..54eab0d3e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql @@ -4,7 +4,8 @@ SELECT pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit, has_database_privilege(db.oid, 'CREATE') as cancreate, current_setting('default_tablespace') AS default_tablespace, - descr.description as comments + descr.description as comments, + datacl AS acl FROM pg_database db LEFT OUTER JOIN pg_tablespace ta ON db.dattablespace=ta.OID LEFT OUTER JOIN pg_shdescription descr ON ( diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql index 9f3c3ff03..ce0474819 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql @@ -4,8 +4,9 @@ SELECT pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit, has_database_privilege(db.oid, 'CREATE') as cancreate, current_setting('default_tablespace') AS default_tablespace, - descr.description as comments - ,(SELECT array_agg(provider || '=' || label) FROM pg_shseclabel sl1 WHERE sl1.objoid=db.oid) AS seclabels + descr.description as comments, + (SELECT array_agg(provider || '=' || label) FROM pg_shseclabel sl1 WHERE sl1.objoid=db.oid) AS seclabels, + datacl AS acl FROM pg_database db LEFT OUTER JOIN pg_tablespace ta ON db.dattablespace=ta.OID LEFT OUTER JOIN pg_shdescription descr ON ( diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql index 9f3c3ff03..ce0474819 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/properties.sql @@ -4,8 +4,9 @@ SELECT pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit, has_database_privilege(db.oid, 'CREATE') as cancreate, current_setting('default_tablespace') AS default_tablespace, - descr.description as comments - ,(SELECT array_agg(provider || '=' || label) FROM pg_shseclabel sl1 WHERE sl1.objoid=db.oid) AS seclabels + descr.description as comments, + (SELECT array_agg(provider || '=' || label) FROM pg_shseclabel sl1 WHERE sl1.objoid=db.oid) AS seclabels, + datacl AS acl FROM pg_database db LEFT OUTER JOIN pg_tablespace ta ON db.dattablespace=ta.OID LEFT OUTER JOIN pg_shdescription descr ON (