diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2025-08-05 09:06:05 -0700 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2025-08-05 09:25:23 -0700 |
| commit | 295a39770e6f7d9c117d52f86ff0596b7d9a590e (patch) | |
| tree | 0425d80203f8b0557ab108f61c9626cfe94bdc18 | |
| parent | f291751ef86ec407b3e67a951f55e79fb160ae10 (diff) | |
Don't copy datlocale from template unless provider matches.
During CREATE DATABASE, if changing the locale provider, require that
a new locale is specified rather than trying to reinterpret the
template's locale using the new provider.
This only affects the behavior when the template uses the builtin
provider and CREATE DATABASE specifies the ICU provider without
specifying the locale. Previously, that may have succeeded due to
loose validation by ICU, whereas now that will cause an error. Because
it can cause an error, backport only to unreleased versions.
Discussion: https://postgr.es/m/5038b33a6dc639009f4b3d43fa6ae0c5ba9e04f7.camel@j-davis.com
Backpatch-through: 18
| -rw-r--r-- | src/backend/commands/dbcommands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 502a45163c8..92a396b8406 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -1052,7 +1052,7 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt) dbctype = src_ctype; if (dblocprovider == '\0') dblocprovider = src_locprovider; - if (dblocale == NULL) + if (dblocale == NULL && dblocprovider == src_locprovider) dblocale = src_locale; if (dbicurules == NULL) dbicurules = src_icurules; |