Force COLLATE "C" to stabilize ordering, redux.

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
index dd1a2389644ea7d8a5f8ae34a974525bde4cc817..e8121f6bfd018a315c0fd3bdf1841f1a3586c59c 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
@@ -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
index de572adfedd3c36b7c1e30c235532ca1a7786ce2..4598531ce7fb72d6032e377b51fa07c8da593654 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
@@ -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