Force COLLATE "C" to stabilize ordering, redux.

tglsfdc · tglsfdc · commit b7dc5da1969c · 2024-04-29T23:32:05.000-04:00
David Rowley correctly pointed out that I'd collat-ified only one of the two troublesome queries. Definitely not my day. 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
@@ -135,7 +135,7 @@ FROM
  type regress_pg_dump_schema.test_type              | postgres | regress_dump_test_role | USAGE          | f
 (58 rows)
 
-SELECT pg_describe_object(classid,objid,objsubid) AS obj,
+SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
   pg_describe_object(refclassid,refobjid,0) AS refobj,
   deptype
   FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
@@ -265,7 +265,7 @@ FROM
  type regress_pg_dump_schema.test_type              | postgres | postgres          | USAGE          | f
 (51 rows)
 
-SELECT pg_describe_object(classid,objid,objsubid) AS obj,
+SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
   pg_describe_object(refclassid,refobjid,0) AS refobj,
   deptype
   FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
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
@@ -86,7 +86,7 @@ FROM
   (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,
+SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
   pg_describe_object(refclassid,refobjid,0) AS refobj,
   deptype
   FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
@@ -138,7 +138,7 @@ FROM
   (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,
+SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
   pg_describe_object(refclassid,refobjid,0) AS refobj,
   deptype
   FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
