8000 Fix ICU locale option handling in CREATE DATABASE · postgrespro/postgres@8b808f1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8b808f1

Browse files
peterepetere
committed
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
1 parent 701ac2c commit 8b808f1

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

‎src/backend/commands/dbcommands.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -912,11 +912,6 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
912912
ereport(ERROR,
913913
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
914914
errmsg("ICU locale cannot be specified unless locale provider is ICU")));
915-
if (dblocprovider == COLLPROVIDER_ICU && !dbiculocale)
916-
{
917-
if (dlocale && dlocale->arg)
918-
dbiculocale = defGetString(dlocale);
919-
}
920915
if (distemplate && distemplate->arg)
921916
dbistemplate = defGetBoolean(distemplate);
922917
if (dallowconnections && dallowconnections->arg)

0 commit comments

Comments
 (0)
0