Fix pg_dumpall regression test to be locale-independent.

The expected results in commit b4fc64578 seem to have been generated
in a non-C locale, which just points up the fact that the ORDER BY
clause was locale-sensitive.

Per buildfarm.

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 45749f3e644feccf6966c13ba75197a2633acb1b..48bfca70ec4eec8a83a5817f224e5dedfaa78609 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1307,11 +1307,11 @@ dumpCreateDB(PGconn *conn)
                                                   "pg_encoding_to_char(d.encoding), "
                                                   "datcollate, datctype, datfrozenxid, datminmxid, "
                                                   "datistemplate, "
-                                                  "(SELECT pg_catalog.array_agg(acl ORDER BY acl::text) FROM ( "
+                                                  "(SELECT pg_catalog.array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
                                                   "  SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba))) AS acl "
                                                   "  EXCEPT SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba))) as datacls)"
                                                   "AS datacl, "
-                                                  "(SELECT pg_catalog.array_agg(acl ORDER BY acl::text) FROM ( "
+                                                  "(SELECT pg_catalog.array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
                                                   "  SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba)) AS acl "
                                                   "  EXCEPT SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba)))) as rdatacls)"
                                                   "AS rdatacl, "

diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index 1d3af87334f01659e7a977cc0eaf6039715d3fe7..90f075bf4f6d0e7524d1d7a16b1487eabfdde034 100644 (file)
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -2484,8 +2484,8 @@ qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
                create_sql   => 'REVOKE CONNECT ON DATABASE dump_test FROM public;',
                regexp       => qr/^
                        \QREVOKE CONNECT,TEMPORARY ON DATABASE dump_test FROM PUBLIC;\E\n
-                       \QGRANT CREATE ON DATABASE dump_test TO regress_dump_test_role;\E\n
-                       \QGRANT TEMPORARY ON DATABASE dump_test TO PUBLIC;\E
+                       \QGRANT TEMPORARY ON DATABASE dump_test TO PUBLIC;\E\n
+                       \QGRANT CREATE ON DATABASE dump_test TO regress_dump_test_role;\E
                        /xm,
                like   => { pg_dumpall_dbprivs => 1, },
                unlike => {