From f4453e33cc28d8ee9e98848b5de6ac41b9444297 Mon Sep 17 00:00:00 2001
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Date: Mon, 15 Jul 2019 14:48:22 +0100
Subject: [PATCH] Stabilise ordering of ACLs in Type RE-SQL tests to prevent
 random failures.

---
 .../schemas/types/templates/types/sql/default/acl.sql         | 1 +
 .../tests/default/alter_composite_type_acl_description.sql    | 4 ++--
 .../types/tests/default/alter_enum_type_acl_description.sql   | 4 ++--
 .../types/tests/default/alter_range_type_acl_description.sql  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
index 3491c7a56..83c1605a1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
@@ -24,3 +24,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/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql
index eb5c7747b..4769bf1db 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql
@@ -15,6 +15,6 @@ ALTER TYPE public."composite_type_$%{}[]()&*^!@""'`\/#"
 COMMENT ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#"
     IS 'this is test';
 
-GRANT USAGE ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
-
 GRANT USAGE ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
+
+GRANT USAGE ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql
index fd619221e..e114d0cfa 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql
@@ -11,6 +11,6 @@ ALTER TYPE public."enum_type_$%{}[]()&*^!@""'`\/#"
 COMMENT ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#"
     IS 'this is test';
 
-GRANT USAGE ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
-
 GRANT USAGE ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
+
+GRANT USAGE ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql
index 8f3d3f62c..496f8422f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql
@@ -14,6 +14,6 @@ ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#"
 COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#"
     IS 'this is test';
 
-GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
-
 GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
+
+GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;