Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0a4bf6b

Browse files
committed
Fix pg_dumpall regression test to be locale-independent.
The expected results in commitb4fc645 seem to have been generatedin a non-C locale, which just points up the fact that the ORDER BYclause was locale-sensitive.Per buildfarm.
1 parent9c4cc9e commit0a4bf6b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,11 +1307,11 @@ dumpCreateDB(PGconn *conn)
13071307
"pg_encoding_to_char(d.encoding), "
13081308
"datcollate, datctype, datfrozenxid, datminmxid, "
13091309
"datistemplate, "
1310-
"(SELECT pg_catalog.array_agg(acl ORDER BY acl::text) FROM ( "
1310+
"(SELECT pg_catalog.array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
13111311
" SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba))) AS acl "
13121312
" EXCEPT SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba))) as datacls)"
13131313
"AS datacl, "
1314-
"(SELECT pg_catalog.array_agg(acl ORDER BY acl::text) FROM ( "
1314+
"(SELECT pg_catalog.array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
13151315
" SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba)) AS acl "
13161316
" EXCEPT SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba)))) as rdatacls)"
13171317
"AS rdatacl, "

‎src/bin/pg_dump/t/002_pg_dump.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,8 +2484,8 @@
24842484
create_sql => 'REVOKE CONNECT ON DATABASE dump_test FROM public;',
24852485
regexp => qr/^
24862486
\QREVOKE CONNECT,TEMPORARY ON DATABASE dump_test FROM PUBLIC;\E\n
2487-
\QGRANTCREATE ON DATABASE dump_test TOregress_dump_test_role;\E\n
2488-
\QGRANTTEMPORARY ON DATABASE dump_test TOPUBLIC;\E
2487+
\QGRANTTEMPORARY ON DATABASE dump_test TOPUBLIC;\E\n
2488+
\QGRANTCREATE ON DATABASE dump_test TOregress_dump_test_role;\E
24892489
/xm,
24902490
like => { pg_dumpall_dbprivs => 1, },
24912491
unlike => {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp