mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-30 09:41:17 +02:00
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.
This commit is contained in:
parent
9c4cc9e2c7
commit
0a4bf6b192
@ -1307,11 +1307,11 @@ dumpCreateDB(PGconn *conn)
|
|||||||
"pg_encoding_to_char(d.encoding), "
|
"pg_encoding_to_char(d.encoding), "
|
||||||
"datcollate, datctype, datfrozenxid, datminmxid, "
|
"datcollate, datctype, datfrozenxid, datminmxid, "
|
||||||
"datistemplate, "
|
"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 "
|
" 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)"
|
" EXCEPT SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba))) as datacls)"
|
||||||
"AS datacl, "
|
"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 "
|
" 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)"
|
" EXCEPT SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba)))) as rdatacls)"
|
||||||
"AS rdatacl, "
|
"AS rdatacl, "
|
||||||
|
@ -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;',
|
create_sql => 'REVOKE CONNECT ON DATABASE dump_test FROM public;',
|
||||||
regexp => qr/^
|
regexp => qr/^
|
||||||
\QREVOKE CONNECT,TEMPORARY ON DATABASE dump_test FROM PUBLIC;\E\n
|
\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\n
|
||||||
\QGRANT TEMPORARY ON DATABASE dump_test TO PUBLIC;\E
|
\QGRANT CREATE ON DATABASE dump_test TO regress_dump_test_role;\E
|
||||||
/xm,
|
/xm,
|
||||||
like => { pg_dumpall_dbprivs => 1, },
|
like => { pg_dumpall_dbprivs => 1, },
|
||||||
unlike => {
|
unlike => {
|
||||||
|
Loading…
Reference in New Issue
Block a user