Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6de31ce

Browse files
committed
Reduce icu_validation_level default to WARNING.
Discussion:https://postgr.es/m/daa9f060aa2349ebc84444515efece49e7b32c5d.camel@j-davis.com
1 parent009bd23 commit6de31ce

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9841,7 +9841,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
98419841
<para>
98429842
If set to <literal>DISABLED</literal>, does not report validation
98439843
problems at all. Otherwise reports problems at the given message
9844-
level. The default is <literal>ERROR</literal>.
9844+
level. The default is <literal>WARNING</literal>.
98459845
</para>
98469846
</listitem>
98479847
</varlistentry>

‎src/backend/utils/adt/pg_locale.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ char *locale_monetary;
9696
char*locale_numeric;
9797
char*locale_time;
9898

99-
inticu_validation_level=ERROR;
99+
inticu_validation_level=WARNING;
100100

101101
/*
102102
* lc_time localization cache.

‎src/backend/utils/misc/guc_tables.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4689,7 +4689,7 @@ struct config_enum ConfigureNamesEnum[] =
46894689
NULL
46904690
},
46914691
&icu_validation_level,
4692-
ERROR,icu_validation_level_options,
4692+
WARNING,icu_validation_level_options,
46934693
NULL,NULL,NULL
46944694
},
46954695

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@
734734
#lc_numeric = 'C'# locale for number formatting
735735
#lc_time = 'C'# locale for time formatting
736736

737-
#icu_validation_level =ERROR# report ICU locale validation
737+
#icu_validation_level =WARNING# report ICU locale validation
738738
# errors at the given level
739739

740740
# default configuration for text search

‎src/test/regress/expected/collate.icu.utf8.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,18 +1037,18 @@ $$;
10371037
RESET client_min_messages;
10381038
CREATE COLLATION test3 (provider = icu, lc_collate = 'en_US.utf8'); -- fail, needs "locale"
10391039
ERROR: parameter "locale" must be specified
1040+
SET icu_validation_level = ERROR;
10401041
CREATE COLLATION testx (provider = icu, locale = 'nonsense-nowhere'); -- fails
10411042
ERROR: ICU locale "nonsense-nowhere" has unknown language "nonsense"
10421043
HINT: To disable ICU locale validation, set parameter icu_validation_level to DISABLED.
10431044
CREATE COLLATION testx (provider = icu, locale = '@colStrength=primary;nonsense=yes'); -- fails
10441045
ERROR: could not convert locale name "@colStrength=primary;nonsense=yes" to language tag: U_ILLEGAL_ARGUMENT_ERROR
1045-
SET icu_validation_level = WARNING;
1046+
RESET icu_validation_level;
10461047
CREATE COLLATION testx (provider = icu, locale = '@colStrength=primary;nonsense=yes'); DROP COLLATION testx;
10471048
WARNING: could not convert locale name "@colStrength=primary;nonsense=yes" to language tag: U_ILLEGAL_ARGUMENT_ERROR
10481049
CREATE COLLATION testx (provider = icu, locale = 'nonsense-nowhere'); DROP COLLATION testx;
10491050
WARNING: ICU locale "nonsense-nowhere" has unknown language "nonsense"
10501051
HINT: To disable ICU locale validation, set parameter icu_validation_level to DISABLED.
1051-
RESET icu_validation_level;
10521052
CREATE COLLATION test4 FROM nonsense;
10531053
ERROR: collation "nonsense" for encoding "UTF8" does not exist
10541054
CREATE COLLATION test5 FROM test0;

‎src/test/regress/sql/collate.icu.utf8.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,12 @@ $$;
376376
RESET client_min_messages;
377377

378378
CREATE COLLATION test3 (provider= icu, lc_collate='en_US.utf8');-- fail, needs "locale"
379+
SET icu_validation_level= ERROR;
379380
CREATE COLLATION testx (provider= icu, locale='nonsense-nowhere');-- fails
380381
CREATE COLLATION testx (provider= icu, locale='@colStrength=primary;nonsense=yes');-- fails
381-
SET icu_validation_level= WARNING;
382+
RESET icu_validation_level;
382383
CREATE COLLATION testx (provider= icu, locale='@colStrength=primary;nonsense=yes'); DROP COLLATION testx;
383384
CREATE COLLATION testx (provider= icu, locale='nonsense-nowhere'); DROP COLLATION testx;
384-
RESET icu_validation_level;
385385

386386
CREATE COLLATION test4FROM nonsense;
387387
CREATE COLLATION test5FROM test0;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp