database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-09 02:08:45 +03:00
Code Activity

Fix global ICU collations for ICU < 54

Browse Source 
createdb() didn't check for collation attributes validity, which has
to be done explicitly on ICU < 54.  It also forgot to close the ICU collator
opened during the check which leaks some memory.

To fix both, add a new check_icu_locale() that does all the appropriate
verification and close the ICU collator.

initdb also had some partial check for ICU < 54.  To have consistent error
reporting across major ICU versions, and get rid of the need to include ucol.h,
remove the partial check there.  The backend will report an error if needed
during the post-boostrap iniitialization phase.

Author: Julien Rouhaud <julien.rouhaud@free.fr>
Discussion: https://www.postgresql.org/message-id/20220319041459.qqqiqh335sga5ezj@jrouhaud
This commit is contained in:
Peter Eisentraut
2022-03-20 10:21:45 +01:00
parent 3c0c5cc5e6
commit 3a671e1f7c
7 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/utils/pg_locale.h
View File

@@ -116,6 +116,7 @@ extern char *get_collation_actual_version(char collprovider, const char *collcol
extern int32_t icu_to_uchar(UChar **buff_uchar, const char *buff, size_t nbytes);
extern int32_t icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar);
#endif
extern void check_icu_locale(const char *icu_locale);
/* These functions convert from/to libc's wchar_t, *not* pg_wchar_t */
extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen,