diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-10-13 10:46:22 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-10-13 10:46:22 -0400 |
| commit | 0a4bf6b192377bef8e69c92d0c95434a91509f12 (patch) | |
| tree | 82c0b2a3e965b8bab7a3e8cebdb1713991239354 | |
| parent | 9c4cc9e2c75e84a8267396be5cccbfe25b8f63f6 (diff) | |
| download | postgresql-0a4bf6b192377bef8e69c92d0c95434a91509f12.tar.gz postgresql-0a4bf6b192377bef8e69c92d0c95434a91509f12.zip | |
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.
| -rw-r--r-- | src/bin/pg_dump/pg_dumpall.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/t/002_pg_dump.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 45749f3e644..48bfca70ec4 100644 --- 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 1d3af87334f..90f075bf4f6 100644 --- 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 => { |