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

Added the 'ORDER BY' clause for the privileges type to fix schema diff issue. Fixes #5689

Browse Source
This commit is contained in:
Akshay Joshi
2020-08-07 16:30:03 +05:30
parent d9c20de31f
commit 518b13c779
13 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.relacl) AS d FROM pg_class db
WHERE db.oid = {{foid}}::OID) a
WHERE db.oid = {{foid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.proacl) AS d FROM pg_proc db
WHERE db.oid = {{fnid}}::OID) a
WHERE db.oid = {{fnid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.proacl) AS d FROM pg_proc db
WHERE db.oid = {{fnid}}::OID) a
WHERE db.oid = {{fnid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.proacl) AS d FROM pg_proc db
WHERE db.oid = {{fnid}}::OID) a
WHERE db.oid = {{fnid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.proacl) AS d FROM pg_proc db
WHERE db.oid = {{fnid}}::OID) a
WHERE db.oid = {{fnid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.proacl) AS d FROM pg_proc db
WHERE db.oid = {{fnid}}::OID) a
WHERE db.oid = {{fnid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/acl.sql
View File

@@ -27,7 +27,7 @@ FROM
(d).privilege_type AS privilege_type
FROM
(SELECT aclexplode(db.proacl) AS d FROM pg_proc db
WHERE db.oid = {{fnid}}::OID) a
WHERE db.oid = {{fnid}}::OID) a ORDER BY privilege_type
) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/acl.sql
View File

@@ -26,7 +26,7 @@ FROM
(SELECT (d).grantee AS grantee, (d).grantor AS grantor, (d).is_grantable
AS is_grantable, (d).privilege_type AS privilege_type FROM (SELECT aclexplode(nspacl) as d FROM pg_namespace
WHERE nspparent = {{scid}}::oid
AND oid = {{pkgid}}::oid) a) d
AND oid = {{pkgid}}::oid) a ORDER BY privilege_type) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/acl.sql
View File

@@ -28,7 +28,7 @@ FROM
AS is_grantable, (d).privilege_type AS privilege_type FROM (SELECT aclexplode(nspacl) as d FROM pg_namespace
WHERE nspparent = {{scid}}::oid
AND oid = {{pkgid}}::oid
AND nspobjecttype = 0) a) d
AND nspobjecttype = 0) a ORDER BY privilege_type) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/acl.sql
View File

@@ -39,7 +39,7 @@ FROM
LEFT JOIN pg_type typ ON rel.reloftype=typ.oid
WHERE rel.relkind IN ('r','s','t','p') AND rel.relnamespace = {{ scid }}::oid
AND rel.oid = {{ tid }}::oid
) a) d
) a ORDER BY privilege_type) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/acl.sql
View File

@@ -39,7 +39,7 @@ FROM
LEFT JOIN pg_type typ ON rel.reloftype=typ.oid
WHERE rel.relkind IN ('r','s','t') AND rel.relnamespace = {{ scid }}::oid
AND rel.oid = {{ tid }}::oid
) a) d
) a ORDER BY privilege_type) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
View File

@@ -19,7 +19,7 @@ FROM
) acl,
(SELECT (d).grantee AS grantee, (d).grantor AS grantor, (d).is_grantable
AS is_grantable, (d).privilege_type AS privilege_type FROM (SELECT
aclexplode(t.typacl) as d FROM pg_type t WHERE t.oid = {{tid}}::oid) a) d
aclexplode(t.typacl) as d FROM pg_type t WHERE t.oid = {{tid}}::oid) a ORDER BY privilege_type) d
) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)