diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2023-06-21 11:10:03 -0700 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2023-06-21 11:10:03 -0700 |
| commit | 2535c74b1a6190cc42e13f6b6b55d94bff4b7dd6 (patch) | |
| tree | cbcc0270e62e44f582ade6691b1011cdf0f30845 /src/test | |
| parent | 555b929bbe7bd2f228e804d2c5bf4a246a319358 (diff) | |
initdb: change default --locale-provider back to libc.
Reverts 27b62377b4.
Discussion: https://postgr.es/m/eff031036baa07f325de29215371a4c9e69d61f3.camel@j-davis.com
Discussion: https://postgr.es/m/3353947.1682092131@sss.pgh.pa.us
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/icu/t/010_database.pl | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/collate.icu.utf8.out | 4 | ||||
| -rw-r--r-- | src/test/regress/sql/collate.icu.utf8.sql | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/test/icu/t/010_database.pl b/src/test/icu/t/010_database.pl index cbe5467f3c6..3beee2ff969 100644 --- a/src/test/icu/t/010_database.pl +++ b/src/test/icu/t/010_database.pl @@ -12,7 +12,7 @@ if ($ENV{with_icu} ne 'yes') } my $node1 = PostgreSQL::Test::Cluster->new('node1'); -$node1->init(extra => ['--locale-provider=libc']); +$node1->init; $node1->start; $node1->safe_psql('postgres', diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out index dc96e590f74..b7fbee447f1 100644 --- a/src/test/regress/expected/collate.icu.utf8.out +++ b/src/test/regress/expected/collate.icu.utf8.out @@ -1023,7 +1023,7 @@ SET client_min_messages TO WARNING; do $$ BEGIN EXECUTE 'CREATE COLLATION test0 (provider = icu, locale = ' || - quote_literal((SELECT daticulocale FROM pg_database WHERE datname = current_database())) || ');'; + quote_literal((SELECT CASE WHEN datlocprovider='i' THEN daticulocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) || ');'; END $$; CREATE COLLATION test0 FROM "C"; -- fail, duplicate name @@ -1031,7 +1031,7 @@ ERROR: collation "test0" already exists do $$ BEGIN EXECUTE 'CREATE COLLATION test1 (provider = icu, locale = ' || - quote_literal((SELECT daticulocale FROM pg_database WHERE datname = current_database())) || ');'; + quote_literal((SELECT CASE WHEN datlocprovider='i' THEN daticulocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) || ');'; END $$; RESET client_min_messages; diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql index a8001b4b8e9..079d7ae39de 100644 --- a/src/test/regress/sql/collate.icu.utf8.sql +++ b/src/test/regress/sql/collate.icu.utf8.sql @@ -362,14 +362,14 @@ SET client_min_messages TO WARNING; do $$ BEGIN EXECUTE 'CREATE COLLATION test0 (provider = icu, locale = ' || - quote_literal((SELECT daticulocale FROM pg_database WHERE datname = current_database())) || ');'; + quote_literal((SELECT CASE WHEN datlocprovider='i' THEN daticulocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) || ');'; END $$; CREATE COLLATION test0 FROM "C"; -- fail, duplicate name do $$ BEGIN EXECUTE 'CREATE COLLATION test1 (provider = icu, locale = ' || - quote_literal((SELECT daticulocale FROM pg_database WHERE datname = current_database())) || ');'; + quote_literal((SELECT CASE WHEN datlocprovider='i' THEN daticulocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) || ');'; END $$; |