Re: ICU for global collation
Marina Polyakova <m.polyakova@postgrespro.ru>
On 2022-09-09 19:46, Justin Pryzby wrote:
> In pg14:
> |postgres=# create database a LC_COLLATE C LC_CTYPE C LOCALE C;
> |ERROR: conflicting or redundant options
> |DETAIL: LOCALE cannot be specified together with LC_COLLATE or
> LC_CTYPE.
>
> In pg15:
> |postgres=# create database a LC_COLLATE "en_US.UTF-8" LC_CTYPE
> "en_US.UTF-8" LOCALE "en_US.UTF-8" ;
> |CREATE DATABASE
>
> f2553d430 actually relaxed the restriction by removing this check:
>
> - if (dlocale && (dcollate || dctype))
> - ereport(ERROR,
> - (errcode(ERRCODE_SYNTAX_ERROR),
> - errmsg("conflicting or redundant
> options"),
> - errdetail("LOCALE cannot be specified
> together with LC_COLLATE or LC_CTYPE.")));
>
> But isn't the right fix to do the corresponding thing in createdb
> (relaxing the frontend restriction rather than reverting its relaxation
> in the backend).
>
> diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
> index e523e58b218..5b80e56dfd9 100644
> --- a/src/bin/scripts/createdb.c
> +++ b/src/bin/scripts/createdb.c
> @@ -159,15 +159,10 @@ main(int argc, char *argv[])
> exit(1);
> }
>
> - if (locale)
> - {
> - if (lc_ctype)
> - pg_fatal("only one of --locale and --lc-ctype can be specified");
> - if (lc_collate)
> - pg_fatal("only one of --locale and --lc-collate can be specified");
> + if (locale && !lc_ctype)
> lc_ctype = locale;
> + if (locale && !lc_collate)
> lc_collate = locale;
> - }
>
> if (encoding)
> {
I agree with you that it is more comfortable and more similar to what
has already been done in initdb. IMO it would be easier to do it like
this:
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index
e523e58b2189275dc603a06324a2f28b0f49d8b7..a1482df3d981a680dd3322052e7c03ddacc8dc26
100644
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -161,12 +161,10 @@ main(int argc, char *argv[])
if (locale)
{
- if (lc_ctype)
- pg_fatal("only one of --locale and --lc-ctype can be specified");
- if (lc_collate)
- pg_fatal("only one of --locale and --lc-collate can be specified");
- lc_ctype = locale;
- lc_collate = locale;
+ if (!lc_ctype)
+ lc_ctype = locale;
+ if (!lc_collate)
+ lc_collate = locale;
}
if (encoding)
Should we change the behaviour of createdb and CREATE DATABASE in
previous major versions?..
> BTW it's somewhat crummy that it uses a string comparison, so if you
> write "UTF8" without a dash, it says this; it took me a few minutes to
> see the difference...
>
> postgres=# create database a LC_COLLATE "en_US.UTF8" LC_CTYPE
> "en_US.UTF8" LOCALE "en_US.UTF8";
> ERROR: new collation (en_US.UTF8) is incompatible with the collation
> of the template database (en_US.UTF-8)
Perhaps we could check the locale itself with the function
normalize_libc_locale_name (collationcmds.c). But ISTM that the current
check is a safety net in case the function pg_get_encoding_from_locale
(chklocale.c) returns -1 or PG_SQL_ASCII...
--
Marina Polyakova
Postgres Professional: http://www.postgrespro.com
The Russian Postgres Company
Commits
GET /api/v1/messages/:b64id/commits
the thread's linked commits as JSON, with link sources.
API reference →
-
Add CHECK_FOR_INTERRUPTS while restoring changes during decoding.
- ce20f8b9f435 16.0 cited
-
Improve ICU option handling in CREATE DATABASE
- e59a67fb8fe1 16.0 landed
- 865b52af6104 15.0 landed
-
Don't allow creation of database with ICU locale with unsupported encoding
- c7db01e325a5 16.0 landed
- 148f66d59e2c 15.0 landed
-
Make locale option behavior more consistent
- da5d4ea5aaac 16.0 landed
- 3e694b318d20 15.0 landed
-
pg_dump: Dump colliculocale
- 72b6828da3f7 15.0 landed
- 396d348b046c 16.0 landed
-
Remove further unwanted linker flags from perl_embed_ldflags
- b4e936859dc4 16.0 cited
-
Doc: document possible need to raise kernel's somaxconn limit.
- 2c63b0930aee 15.0 cited
-
Reduce warnings with -Wshadow=compatible-local builds
- 92fce4e1eda9 16.0 cited
-
Remove redundant spaces in _outA_Expr() output
- 1c5818b9c68e 16.0 cited
-
Fix outdated --help message for postgres -f
- 63b64d827069 14.6 cited
-
pg_upgrade: Fix version comparison for global ICU support
- fa06a34d14ea 15.0 landed
-
Silence -Wmaybe-uninitialized compiler warning in dbcommands.c.
- 97bddda61b9a 15.0 landed
-
Add option to use ICU as global locale provider
- f2553d43060e 15.0 landed
-
DefineCollation() code cleanup
- e94bb1473eb3 15.0 landed
-
Change collate and ctype fields to type text
- 54637508f87b 15.0 landed
-
Call pg_newlocale_from_collation() also with default collation
- b99ccd2cb217 15.0 landed
-
Use libc version as a collation version on glibc systems.
- d5ac14f9ccdd 13.0 cited
-
Silence -Wmaybe-uninitialized compiler warnings in dbcommands.c.
- 3f6b3be39ca9 13.0 cited
-
Make LC_COLLATE and LC_CTYPE database-level settings. Collation and
- 61d967498802 8.4.0 cited