Fix pg_dumpall regression test to be locale-independent.

tglsfdc · tglsfdc · commit 0a4bf6b19237 · 2016-10-13T10:46:22.000-04:00
The expected results in commit b4fc645 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
@@ -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
@@ -2484,8 +2484,8 @@
 		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 => {
