mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initdb: change default --locale-provider back to libc.

Browse Source 
Reverts 27b62377b4.

Discussion: https://postgr.es/m/eff031036baa07f325de29215371a4c9e69d61f3.camel@j-davis.com
Discussion: https://postgr.es/m/3353947.1682092131@sss.pgh.pa.us
This commit is contained in:
Jeff Davis 2023-06-21 11:10:03 -07:00
parent 555b929bbe
commit 2535c74b1a
8 changed files with 29 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
doc/src/sgml/ref/initdb.sgml
View File

@ -93,24 +93,10 @@ PostgreSQL documentation
</para>
<para>
By default, <command>initdb</command> uses the ICU library to provide
locale services if the server was built with ICU support; otherwise it uses
the <literal>libc</literal> locale provider (see <xref
linkend="locale-providers"/>). To choose the specific ICU locale ID to
apply, use the option <option>--icu-locale</option>. Note that for
implementation reasons and to support legacy code,
<command>initdb</command> will still select and initialize libc locale
settings when the ICU locale provider is used.
</para>
<para>
Alternatively, <command>initdb</command> can use the locale provider
<literal>libc</literal>. To select this option, specify
<literal>--locale-provider=libc</literal>, or build the server without ICU
support. The <literal>libc</literal> locale provider takes the locale
settings from the environment, and determines the encoding from the locale
settings. This is almost always sufficient, unless there are special
requirements.
By default, <command>initdb</command> uses the locale provider
<literal>libc</literal> (see <xref linkend="locale-providers"/>). The
<literal>libc</literal> locale provider takes the locale settings from the
environment, and determines the encoding from the locale settings.
</para>
<para>
@ -122,6 +108,16 @@ PostgreSQL documentation
this should be used with care.
</para>
<para>
Alternatively, <command>initdb</command> can use the ICU library to provide
locale services by specifying <literal>--locale-provider=icu</literal>. The
server must be built with ICU support. To choose the specific ICU locale ID
to apply, use the option <option>--icu-locale</option>. Note that for
implementation reasons and to support legacy code,
<command>initdb</command> will still select and initialize libc locale
settings when the ICU locale provider is used.
</para>
<para>
When <command>initdb</command> runs, it will print out the locale settings
it has chosen. If you have complex requirements or specified multiple
@ -251,11 +247,6 @@ PostgreSQL documentation
Specifies the ICU locale when the ICU provider is used. Locale support
is described in <xref linkend="locale"/>.
</para>
<para>
If this option is not specified, the locale is inherited from the
environment in which <command>initdb</command> runs. The environment's
locale is matched to a similar ICU locale name, if possible.
</para>
</listitem>
</varlistentry>
@ -330,9 +321,8 @@ PostgreSQL documentation
This option sets the locale provider for databases created in the new
cluster. It can be overridden in the <command>CREATE
DATABASE</command> command when new databases are subsequently
created. The default is <literal>icu</literal> if the server was
built with ICU support; otherwise the default is
<literal>libc</literal> (see <xref linkend="locale-providers"/>).
created. The default is <literal>libc</literal> (see <xref
linkend="locale-providers"/>).
</para>
</listitem>
</varlistentry>

23
src/bin/initdb/initdb.c
View File

@ -143,11 +143,7 @@ static char *lc_monetary = NULL;
static char *lc_numeric = NULL;
static char *lc_time = NULL;
static char *lc_messages = NULL;
#ifdef USE_ICU
static char locale_provider = COLLPROVIDER_ICU;
#else
static char locale_provider = COLLPROVIDER_LIBC;
#endif
static char *icu_locale = NULL;
static char *icu_rules = NULL;
static const char *default_text_search_config = NULL;
@ -2357,19 +2353,6 @@ icu_validate_locale(const char *loc_str)
#endif
}
/*
* Determine the default ICU locale
*/
static char *
default_icu_locale(void)
{
#ifdef USE_ICU
return pg_strdup(uloc_getDefault());
#else
pg_fatal("ICU is not supported in this build");
#endif
}
/*
* set up the locale variables
*
@ -2429,10 +2412,7 @@ setlocales(void)
/* acquire default locale from the environment, if not specified */
if (icu_locale == NULL)
{
icu_locale = default_icu_locale();
printf(_("Using default ICU locale \"%s\".\n"), icu_locale);
}
pg_fatal("ICU locale must be specified");
/* canonicalize to a language tag */
langtag = icu_language_tag(icu_locale);
@ -3273,7 +3253,6 @@ main(int argc, char *argv[])
break;
case 8:
locale = "C";
locale_provider = COLLPROVIDER_LIBC;
break;
case 9:
pwfilename = pg_strdup(optarg);

5
src/bin/initdb/t/001_initdb.pl
View File

@ -103,6 +103,11 @@ SKIP:
if ($ENV{with_icu} eq 'yes')
{
command_fails_like(
[ 'initdb', '--no-sync', '--locale-provider=icu', "$tempdir/data2" ],
qr/initdb: error: ICU locale must be specified/,
'locale provider ICU requires --icu-locale');
command_ok(
[
'initdb', '--no-sync',

2
src/bin/pg_dump/t/002_pg_dump.pl
View File

@ -1965,7 +1965,7 @@ my %tests = (
create_sql =>
"CREATE DATABASE dump_test2 LOCALE = 'C' TEMPLATE = template0;",
regexp => qr/^
\QCREATE DATABASE dump_test2 \E.*\QLOCALE = 'C'\E
\QCREATE DATABASE dump_test2 \E.*\QLOCALE = 'C';\E
/xm,
like => { pg_dumpall_dbprivs => 1, },
},

2
src/bin/scripts/t/020_createdb.pl
View File

@ -13,7 +13,7 @@ program_version_ok('createdb');
program_options_handling_ok('createdb');
my $node = PostgreSQL::Test::Cluster->new('main');
$node->init(extra => ['--locale-provider=libc']);
$node->init;
$node->start;
$node->issues_sql_like(

2
src/test/icu/t/010_database.pl
View File

@ -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',

4
src/test/regress/expected/collate.icu.utf8.out
View File

@ -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;

4
src/test/regress/sql/collate.icu.utf8.sql
View File

@ -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
$$;