Commit8b808f1

committed

Fix ICU locale option handling in CREATE DATABASE

The code took the LOCALE option as the default/fallback forICU_LOCALE, but this was neither documented nor intended, so removeit. (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 parent701ac2c commit8b808f1Copy full SHA for 8b808f1

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -912,11 +912,6 @@ createdb(ParseState pstate, const CreatedbStmt stmt)`
`912`	`912`	`ereport(ERROR,`
`913`	`913`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`914`	`914`	`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`		`-}`
`920`	`915`	`if (distemplate&&distemplate->arg)`
`921`	`916`	`dbistemplate=defGetBoolean(distemplate);`
`922`	`917`	`if (dallowconnections&&dallowconnections->arg)`

Comments

(0)