diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-08-01 10:49:55 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-08-05 09:32:42 -0400 |
| commit | eccead9ed43dc6e653c76dce1d2f455d251bb00c (patch) | |
| tree | e2e997b1970f172ee2a540b7538fbb2398496099 /src | |
| parent | f85f88bcc270cf12defc34f143456834d8d8c6f8 (diff) | |
| download | postgresql-eccead9ed43dc6e653c76dce1d2f455d251bb00c.tar.gz postgresql-eccead9ed43dc6e653c76dce1d2f455d251bb00c.zip | |
Add support for ICU 4.2
Supporting ICU 4.2 seems useful because it ships with CentOS 6.
Versions before ICU 4.6 don't support pkg-config, so document an
installation method without using pkg-config.
In ICU 4.2, ucol_getKeywordsForLocale() sometimes returns values that
will not be accepted by uloc_toLanguageTag(). Skip loading keyword
variants in that version.
Reported-by: Victor Wagner <vitus@wagner.pp.ru>
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/collationcmds.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index d19a384f9c1..ea257a37864 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -722,7 +722,17 @@ pg_import_system_collations(PG_FUNCTION_ARGS) /* * Add keyword variants + * + * In ICU 4.2, ucol_getKeywordsForLocale() sometimes returns + * values that will not be accepted by uloc_toLanguageTag(). Skip + * loading keyword variants in that version. (Both + * ucol_getKeywordValuesForLocale() and uloc_toLanguageTag() are + * new in ICU 4.2, so older versions are not supported at all.) + * + * XXX We have no information about ICU 4.3 through 4.7, but we + * know the below works with 4.8. */ +#if U_ICU_VERSION_MAJOR_NUM > 4 || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM > 2) status = U_ZERO_ERROR; en = ucol_getKeywordValuesForLocale("collation", name, TRUE, &status); if (U_FAILURE(status)) @@ -769,6 +779,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS) (errmsg("could not get keyword values for locale \"%s\": %s", name, u_errorName(status)))); uenum_close(en); +#endif /* ICU >4.2 */ } } #endif /* USE_ICU */ |