Fix locale options checking in CREATE DATABASE.

jeff-davis · jeff-davis · commit 7562a9bd7100 · 2024-04-30T17:32:03.000-07:00
Discussion: https://postgr.es/m/4ea13583-7305-40b0-8525-58381533e2b1@eisentraut.org Reported-by: Peter Eisentraut
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
@@ -1073,7 +1073,8 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 					 errmsg("BUILTIN_LOCALE cannot be specified unless locale provider is builtin")));
 	}
-	else if (dblocprovider != COLLPROVIDER_ICU)
+
+	if (dblocprovider != COLLPROVIDER_ICU)
 	{
 		if (diculocale)
 			ereport(ERROR,

Original file line number	Diff line number	Diff line change
`@@ -1073,7 +1073,8 @@ createdb(ParseState pstate, const CreatedbStmt stmt)`
`1073`	`1073`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`1074`	`1074`	`errmsg("BUILTIN_LOCALE cannot be specified unless locale provider is builtin")));`
`1075`	`1075`	`}`
`1076`		`- else if (dblocprovider != COLLPROVIDER_ICU)`
	`1076`	`+`
	`1077`	`+ if (dblocprovider != COLLPROVIDER_ICU)`
`1077`	`1078`	`{`
`1078`	`1079`	`if (diculocale)`
`1079`	`1080`	`ereport(ERROR,`