aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/dbcommands.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2022-08-24 13:27:34 +0200
committerPeter Eisentraut <peter@eisentraut.org>2022-08-24 13:34:53 +0200
commitf02147bd237eb59d908ed3166895081ba17df4a1 (patch)
tree75295b4bc5d265ca75a19592a19a882d2ffa00bf /src/backend/commands/dbcommands.c
parentdfe2eb7633f53c26cac6d31d1cb5736113d16349 (diff)
downloadpostgresql-f02147bd237eb59d908ed3166895081ba17df4a1.tar.gz
postgresql-f02147bd237eb59d908ed3166895081ba17df4a1.zip
Fix ICU locale option handling in CREATE DATABASE
The code took the LOCALE option as the default/fallback for ICU_LOCALE, but this was neither documented nor intended, so remove it. (It was probably left in from an earlier patch version.) Reported-by: Marina Polyakova <m.polyakova@postgrespro.ru> Discussion: https://www.postgresql.org/message-id/flat/f385ba25e7f8be427b8c582e5cca7d79%40postgrespro.ru#515a31c5429d6d37ad1d5c9d66962a1e
Diffstat (limited to 'src/backend/commands/dbcommands.c')
-rw-r--r--src/backend/commands/dbcommands.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index e2c1ac0df73..59e217b9f9d 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -911,11 +911,6 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("ICU locale cannot be specified unless locale provider is ICU")));
- if (dblocprovider == COLLPROVIDER_ICU && !dbiculocale)
- {
- if (dlocale && dlocale->arg)
- dbiculocale = defGetString(dlocale);
- }
if (distemplate && distemplate->arg)
dbistemplate = defGetBoolean(distemplate);
if (dallowconnections && dallowconnections->arg)