diff options
Diffstat (limited to 'src/bin/initdb/initdb.c')
| -rw-r--r-- | src/bin/initdb/initdb.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 497f2205f0c..d48b7b6060c 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -2350,18 +2350,19 @@ setup_locale_encoding(void) lc_time); } - if (!encoding && locale_provider == COLLPROVIDER_ICU) - { - encodingid = PG_UTF8; - printf(_("The default database encoding has been set to \"%s\".\n"), - pg_encoding_to_char(encodingid)); - } - else if (!encoding) + if (!encoding) { int ctype_enc; ctype_enc = pg_get_encoding_from_locale(lc_ctype, true); + /* + * If ctype_enc=SQL_ASCII, it's compatible with any encoding. ICU does + * not support SQL_ASCII, so select UTF-8 instead. + */ + if (locale_provider == COLLPROVIDER_ICU && ctype_enc == PG_SQL_ASCII) + ctype_enc = PG_UTF8; + if (ctype_enc == -1) { /* Couldn't recognize the locale's codeset */ |