From 3ca8e0a84f6593ffff9a409bd31dc1c9ed253d3a Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Thu, 11 May 2023 12:54:31 -0700 Subject: [PATCH v5 7/7] Add default_collation_provider GUC. Controls default collation provider for CREATE COLLATION. Does not affect CREATE DATABASE, which gets its default from the template database. --- doc/src/sgml/config.sgml | 17 +++++++++++++++++ src/backend/commands/collationcmds.c | 3 ++- src/backend/utils/misc/guc_tables.c | 18 ++++++++++++++++++ src/backend/utils/misc/postgresql.conf.sample | 4 ++++ src/include/commands/collationcmds.h | 2 ++ src/test/regress/expected/collate.icu.utf8.out | 17 +++++++++++++++++ src/test/regress/sql/collate.icu.utf8.sql | 10 ++++++++++ 7 files changed, 70 insertions(+), 1 deletion(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index c4a9dcb9ae..038ecf9811 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -9819,6 +9819,23 @@ SET XML OPTION { DOCUMENT | CONTENT }; + + default_collation_provider (enum) + + default_collation_provider configuration parameter + + + + + Default collation provider for CREATE + COLLATION. Does not affect CREATE + DATABASE, which gets the default collation provider from the + template database. Valid values are icu and + libc. The default is libc. + + + + icu_validation_level (enum) diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 9a83f9f303..b42a660386 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -47,6 +47,7 @@ typedef struct int enc; /* encoding */ } CollAliasData; +int default_collation_provider = (int) COLLPROVIDER_LIBC; /* * CREATE COLLATION @@ -228,7 +229,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e collproviderstr))); } else - collprovider = COLLPROVIDER_LIBC; + collprovider = (char) default_collation_provider; if (collprovider == COLLPROVIDER_NONE && (localeEl || lccollateEl || lcctypeEl)) diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 8c843f4ab6..d64b3a9a6f 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -35,8 +35,10 @@ #include "access/xlogrecovery.h" #include "archive/archive_module.h" #include "catalog/namespace.h" +#include "catalog/pg_collation.h" #include "catalog/storage.h" #include "commands/async.h" +#include "commands/collationcmds.h" #include "commands/tablespace.h" #include "commands/trigger.h" #include "commands/user.h" @@ -166,6 +168,12 @@ static const struct config_enum_entry intervalstyle_options[] = { {NULL, 0, false} }; +static const struct config_enum_entry collation_provider_options[] = { + {"icu", (int) 'i', false}, + {"libc", (int) 'c', false}, + {NULL, 0, false} +}; + static const struct config_enum_entry icu_validation_level_options[] = { {"disabled", -1, false}, {"debug5", DEBUG5, false}, @@ -4683,6 +4691,16 @@ struct config_enum ConfigureNamesEnum[] = NULL, NULL, NULL }, + { + {"default_collation_provider", PGC_USERSET, CLIENT_CONN_LOCALE, + gettext_noop("Default collation provider for CREATE COLLATION."), + NULL + }, + &default_collation_provider, + (int) COLLPROVIDER_LIBC, collation_provider_options, + NULL, NULL, NULL + }, + { {"icu_validation_level", PGC_USERSET, CLIENT_CONN_LOCALE, gettext_noop("Log level for reporting invalid ICU locale strings."), diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 87bad8ecbf..b2b015b31f 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -734,6 +734,10 @@ #lc_numeric = 'C' # locale for number formatting #lc_time = 'C' # locale for time formatting +#default_collation_provider = 'libc' # default collation provider + # for CREATE COLLATION + # (none, icu, libc) + #icu_validation_level = WARNING # report ICU locale validation # errors at the given level diff --git a/src/include/commands/collationcmds.h b/src/include/commands/collationcmds.h index b76c7b3dc3..f54389525d 100644 --- a/src/include/commands/collationcmds.h +++ b/src/include/commands/collationcmds.h @@ -18,6 +18,8 @@ #include "catalog/objectaddress.h" #include "parser/parse_node.h" +extern PGDLLIMPORT int default_collation_provider; + extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists); extern void IsThereCollationInNamespace(const char *collname, Oid nspOid); extern ObjectAddress AlterCollation(AlterCollationStmt *stmt); diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out index 39f61ca281..d9da8d1310 100644 --- a/src/test/regress/expected/collate.icu.utf8.out +++ b/src/test/regress/expected/collate.icu.utf8.out @@ -1038,6 +1038,23 @@ RESET client_min_messages; -- uses "none" provider instead CREATE COLLATION testc (provider = icu, locale='C'); NOTICE: using locale provider "none" for ICU locale "C" +SET default_collation_provider = 'libc'; +CREATE COLLATION def_libc (LOCALE = 'C'); +SELECT collname, collprovider FROM pg_collation WHERE collname='def_libc'; + collname | collprovider +----------+-------------- + def_libc | c +(1 row) + +SET default_collation_provider = 'icu'; +CREATE COLLATION def_icu (LOCALE = 'und'); +SELECT collname, collprovider FROM pg_collation WHERE collname='def_icu'; + collname | collprovider +----------+-------------- + def_icu | i +(1 row) + +RESET default_collation_provider; CREATE COLLATION test3 (provider = icu, lc_collate = 'en_US.utf8'); -- fail, needs "locale" ERROR: parameter "locale" must be specified SET icu_validation_level = ERROR; diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql index 63c29dfe2a..13089c7f8e 100644 --- a/src/test/regress/sql/collate.icu.utf8.sql +++ b/src/test/regress/sql/collate.icu.utf8.sql @@ -378,6 +378,16 @@ RESET client_min_messages; -- uses "none" provider instead CREATE COLLATION testc (provider = icu, locale='C'); +SET default_collation_provider = 'libc'; +CREATE COLLATION def_libc (LOCALE = 'C'); +SELECT collname, collprovider FROM pg_collation WHERE collname='def_libc'; + +SET default_collation_provider = 'icu'; +CREATE COLLATION def_icu (LOCALE = 'und'); +SELECT collname, collprovider FROM pg_collation WHERE collname='def_icu'; + +RESET default_collation_provider; + CREATE COLLATION test3 (provider = icu, lc_collate = 'en_US.utf8'); -- fail, needs "locale" SET icu_validation_level = ERROR; CREATE COLLATION testx (provider = icu, locale = 'nonsense-nowhere'); -- fails -- 2.34.1