From cd839f069cc09a71788bafa28730e4caf8f9d768 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Wed, 10 May 2023 10:47:16 -0700 Subject: [PATCH v5 3/7] Reduce icu_validation_level default to WARNING. --- doc/src/sgml/config.sgml | 2 +- src/backend/utils/adt/pg_locale.c | 2 +- src/backend/utils/misc/guc_tables.c | 2 +- src/backend/utils/misc/postgresql.conf.sample | 2 +- src/test/regress/expected/collate.icu.utf8.out | 4 ++-- src/test/regress/sql/collate.icu.utf8.sql | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index b56f073a91..c4a9dcb9ae 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -9840,7 +9840,7 @@ SET XML OPTION { DOCUMENT | CONTENT }; If set to DISABLED, does not report validation problems at all. Otherwise reports problems at the given message - level. The default is ERROR. + level. The default is WARNING. diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index e7b166461b..bb4a8d84f6 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -96,7 +96,7 @@ char *locale_monetary; char *locale_numeric; char *locale_time; -int icu_validation_level = ERROR; +int icu_validation_level = WARNING; /* * lc_time localization cache. diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 2f42cebaf6..8c843f4ab6 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -4689,7 +4689,7 @@ struct config_enum ConfigureNamesEnum[] = NULL }, &icu_validation_level, - ERROR, icu_validation_level_options, + WARNING, icu_validation_level_options, NULL, NULL, NULL }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index b70c66ca87..87bad8ecbf 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -734,7 +734,7 @@ #lc_numeric = 'C' # locale for number formatting #lc_time = 'C' # locale for time formatting -#icu_validation_level = ERROR # report ICU locale validation +#icu_validation_level = WARNING # report ICU locale validation # errors at the given level # default configuration for text search diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out index e0f11e3cd4..12afc3b65a 100644 --- a/src/test/regress/expected/collate.icu.utf8.out +++ b/src/test/regress/expected/collate.icu.utf8.out @@ -1037,6 +1037,7 @@ $$; RESET client_min_messages; CREATE COLLATION test3 (provider = icu, lc_collate = 'en_US.utf8'); -- fail, needs "locale" ERROR: parameter "locale" must be specified +SET icu_validation_level = ERROR; CREATE COLLATION testx (provider = icu, locale = 'nonsense-nowhere'); -- fails ERROR: ICU locale "nonsense-nowhere" has unknown language "nonsense" HINT: To disable ICU locale validation, set parameter icu_validation_level to DISABLED. @@ -1044,7 +1045,7 @@ CREATE COLLATION testx (provider = icu, locale = '@colStrength=primary;nonsense= ERROR: could not convert locale name "@colStrength=primary;nonsense=yes" to language tag: U_ILLEGAL_ARGUMENT_ERROR CREATE COLLATION testx (provider = icu, locale = '@ASDF'); -- fails ERROR: could not convert locale name "@ASDF" to language tag: U_ILLEGAL_ARGUMENT_ERROR -SET icu_validation_level = WARNING; +RESET icu_validation_level; CREATE COLLATION testx (provider = icu, locale = '@colStrength=primary;nonsense=yes'); DROP COLLATION testx; WARNING: could not convert locale name "@colStrength=primary;nonsense=yes" to language tag: U_ILLEGAL_ARGUMENT_ERROR CREATE COLLATION testx (provider = icu, locale = 'nonsense-nowhere'); DROP COLLATION testx; @@ -1052,7 +1053,6 @@ WARNING: ICU locale "nonsense-nowhere" has unknown language "nonsense" HINT: To disable ICU locale validation, set parameter icu_validation_level to DISABLED. CREATE COLLATION testx (provider = icu, locale = '@ASDF'); DROP COLLATION testx; WARNING: could not convert locale name "@ASDF" to language tag: U_ILLEGAL_ARGUMENT_ERROR -RESET icu_validation_level; -- test special variants CREATE COLLATION testx (provider = icu, locale = '@EURO'); DROP COLLATION testx; NOTICE: using standard form "und-u-cu-eur" for locale "@EURO" diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql index 8d5423bc17..655c965f46 100644 --- a/src/test/regress/sql/collate.icu.utf8.sql +++ b/src/test/regress/sql/collate.icu.utf8.sql @@ -376,14 +376,14 @@ $$; RESET client_min_messages; 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 CREATE COLLATION testx (provider = icu, locale = '@colStrength=primary;nonsense=yes'); -- fails CREATE COLLATION testx (provider = icu, locale = '@ASDF'); -- fails -SET icu_validation_level = WARNING; +RESET icu_validation_level; CREATE COLLATION testx (provider = icu, locale = '@colStrength=primary;nonsense=yes'); DROP COLLATION testx; CREATE COLLATION testx (provider = icu, locale = 'nonsense-nowhere'); DROP COLLATION testx; CREATE COLLATION testx (provider = icu, locale = '@ASDF'); DROP COLLATION testx; -RESET icu_validation_level; -- test special variants CREATE COLLATION testx (provider = icu, locale = '@EURO'); DROP COLLATION testx; -- 2.34.1