Force COLLATE "C" to stabilize ordering in new test_pg_dump queries.

Should have thought of the need for this.

(Local testing suggests that we may still not be out of the
woods, but certainly this much is needed.)

Per buildfarm and David Rowley.

Discussion: https://postgr.es/m/CAApHDvo8pMk5WWFAqwGzuQ-Xh+957W61io_OsCP0oUzqCCODTg@mail.gmail.com

diff --git a/src/test/modules/test_pg_dump/expected/test_pg_dump.out b/src/test/modules/test_pg_dump/expected/test_pg_dump.out
index dc493e5be26e9ea97a07a2bd84fba48e979198ac..dd1a2389644ea7d8a5f8ae34a974525bde4cc817 100644 (file)
--- a/src/test/modules/test_pg_dump/expected/test_pg_dump.out
+++ b/src/test/modules/test_pg_dump/expected/test_pg_dump.out
@@ -70,7 +70,7 @@ SELECT s.obj,
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
-  (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
+  (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |        grantee         | privilege_type | is_grantable 
@@ -207,7 +207,7 @@ SELECT s.obj,
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
-  (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
+  (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
                         obj                         | grantor  |      grantee      | privilege_type | is_grantable 

diff --git a/src/test/modules/test_pg_dump/sql/test_pg_dump.sql b/src/test/modules/test_pg_dump/sql/test_pg_dump.sql
index 48e99bb5ccd8645538d7a77d3c3b1c96292016e0..de572adfedd3c36b7c1e30c235532ca1a7786ce2 100644 (file)
--- a/src/test/modules/test_pg_dump/sql/test_pg_dump.sql
+++ b/src/test/modules/test_pg_dump/sql/test_pg_dump.sql
@@ -83,7 +83,7 @@ SELECT s.obj,
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
-  (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
+  (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
 SELECT pg_describe_object(classid,objid,objsubid) AS obj,
@@ -135,7 +135,7 @@ SELECT s.obj,
     ELSE a.grantee::regrole::name END,
   a.privilege_type, a.is_grantable
 FROM
-  (SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
+  (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
    FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
   aclexplode(s.initprivs) a;
 SELECT pg_describe_object(classid,objid,objsubid) AS obj,