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:27:34 +0200
commit8b808f189fb1f62a6830e5c023f4ae49a1f4c9a8 (patch)
tree66f411c544a502c2c777e4e5c020cf2e2edd15f3 /src/backend/commands/dbcommands.c
parent701ac2cb1fa25ca0b8572e87073d9008ed406b55 (diff)
downloadpostgresql-8b808f189fb1f62a6830e5c023f4ae49a1f4c9a8.tar.gz
postgresql-8b808f189fb1f62a6830e5c023f4ae49a1f4c9a8.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 883f381f345..6ff48bb18f3 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -912,11 +912,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)