From b52431f6494b61ac2c825fcaeb79be2b93c5ddfd Mon Sep 17 00:00:00 2001 From: Marina Polyakova Date: Sat, 29 Oct 2022 12:50:24 +0300 Subject: [PATCH v1] Fix database creation during installchecks for ICU cluster 1) Explicitly set the locale provider libc for the option --no-locale. Otherwise during installcheck the new database may use the ICU locale provider with the custom ICU locale from template0. 2) Explicitly set the locale provider libc for the manually chosen encoding. Otherwise during installcheck the new database may use the ICU locale provider (from template0) which does not support all encodings. This is important for ECPG tests that require SQL_ASCII encoding. --- src/test/regress/pg_regress.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index dda076847a..4aa42c6b1c 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -1899,14 +1899,25 @@ create_database(const char *dbname) /* * We use template0 so that any installation-local cruft in template1 will * not mess up the tests. + * + * Explicitly set the locale provider libc for the option --no-locale. + * Otherwise during installcheck the new database may use the ICU locale + * provider with the custom ICU locale from template0. */ header(_("creating database \"%s\""), dbname); if (encoding) + + /* + * Explicitly set the locale provider libc for the manually chosen + * encoding. Otherwise during installcheck the new database may use + * the ICU locale provider (from template0) which does not support all + * encodings. + */ psql_add_command(buf, "CREATE DATABASE \"%s\" TEMPLATE=template0 ENCODING='%s'%s", dbname, encoding, - (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); + (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C' LOCALE_PROVIDER='libc'" : " LOCALE_PROVIDER='libc'"); else psql_add_command(buf, "CREATE DATABASE \"%s\" TEMPLATE=template0%s", dbname, - (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); + (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C' LOCALE_PROVIDER='libc'" : ""); psql_add_command(buf, "ALTER DATABASE \"%s\" SET lc_messages TO 'C';" "ALTER DATABASE \"%s\" SET lc_monetary TO 'C';" -- 2.25.1