Ensure consistent orderings for ACLS when comparing schemas in the sc…

…hema diff. #5101
pgadmin-org · Sep 28, 2022 · 545c76a · 545c76a
1 parent e3e0e3d
commit 545c76a
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 11 deletions.
diff --git a/...er_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql b/...er_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql
@@ -32,4 +32,5 @@ FROM
     ) 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)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/..._groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/acl.sql b/..._groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/acl.sql
@@ -32,4 +32,5 @@ FROM
     ) 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)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...ps/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/acl.sql b/...ps/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/acl.sql
@@ -32,4 +32,5 @@ FROM
     ) 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)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/.../servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/acl.sql b/.../servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/acl.sql
@@ -32,4 +32,5 @@ FROM
     ) 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)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...owser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/acl.sql b/...owser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/acl.sql
@@ -44,3 +44,4 @@ FROM
   LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
   LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY g.rolname, gt.rolname
+ORDER BY grantee
diff --git a/...browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/acl.sql b/...browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/acl.sql
@@ -20,4 +20,5 @@ FROM
     ) b
     LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/acl.sql b/...browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/acl.sql
@@ -20,4 +20,5 @@ FROM
     ) b
     LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/.../browser/server_groups/servers/databases/schemas/templates/catalog/pg/default/sql/acl.sql b/.../browser/server_groups/servers/databases/schemas/templates/catalog/pg/default/sql/acl.sql
@@ -20,4 +20,5 @@ FROM
     ) b
     LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...owser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/acl.sql b/...owser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/acl.sql
@@ -20,4 +20,5 @@ FROM
     ) b
     LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...owser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/acl.sql b/...owser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/acl.sql
@@ -20,4 +20,5 @@ FROM
     ) b
     LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...rowser/server_groups/servers/databases/schemas/templates/catalog/ppas/default/sql/acl.sql b/...rowser/server_groups/servers/databases/schemas/templates/catalog/ppas/default/sql/acl.sql
@@ -20,4 +20,5 @@ FROM
     ) b
     LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...ser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/acl.sql b/...ser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/acl.sql
@@ -38,4 +38,5 @@ LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY
     g.rolname,
     gt.rolname
+ORDER BY grantee
 {% endif %}
diff --git a/...wser/server_groups/servers/databases/schemas/views/templates/views/pg/default/sql/acl.sql b/...wser/server_groups/servers/databases/schemas/views/templates/views/pg/default/sql/acl.sql
@@ -36,4 +36,5 @@ LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY
     g.rolname,
     gt.rolname
+ORDER BY grantee
 {% endif %}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/acl.sql
@@ -32,4 +32,5 @@ FROM
     ) 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)
-GROUP BY g.rolname, gt.rolname;
+GROUP BY g.rolname, gt.rolname
+ORDER BY grantee;
diff --git a/...admin/browser/server_groups/servers/tablespaces/templates/tablespaces/sql/default/acl.sql b/...admin/browser/server_groups/servers/tablespaces/templates/tablespaces/sql/default/acl.sql
@@ -26,3 +26,4 @@ FROM
   LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
   LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY g.rolname, gt.rolname
+ORDER BY grantee