Improve ICU option handling in CREATE DATABASE

petere · petere · commit 865b52af6104 · 2022-09-21T10:41:27.000-04:00
We check that the ICU locale is only specified if the ICU locale provider is selected. But we did that too early. We need to wait until we load the settings of the template database, since that could also set what the locale provider is. Reported-by: Marina Polyakova <m.polyakova@postgrespro.ru> Discussion: https://www.postgresql.org/message-id/9ba4cd1ea6ed6b7b15c0ff15e6f540cd@postgrespro.ru
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
@@ -907,10 +907,6 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 					 errmsg("unrecognized locale provider: %s",
 							locproviderstr)));
 	}
-	if (diculocale && dblocprovider != COLLPROVIDER_ICU)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-				 errmsg("ICU locale cannot be specified unless locale provider is ICU")));
 	if (distemplate && distemplate->arg)
 		dbistemplate = defGetBoolean(distemplate);
 	if (dallowconnections && dallowconnections->arg)
@@ -1050,6 +1046,13 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 
 		check_icu_locale(dbiculocale);
 	}
+	else
+	{
+		if (dbiculocale)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("ICU locale cannot be specified unless locale provider is ICU")));
+	}
 
 	/*
 	 * Check that the new encoding and locale settings match the source
diff --git a/src/bin/scripts/t/020_createdb.pl b/src/bin/scripts/t/020_createdb.pl
@@ -71,6 +71,10 @@
 	$node2->command_ok(
 		[ 'createdb', '-T', 'template0', '--locale-provider=libc', 'foobar55' ],
 		'create database with libc provider from template database with icu provider');
+
+	$node2->command_ok(
+		[ 'createdb', '-T', 'template0', '--icu-locale', 'en-US', 'foobar56' ],
+		'create database with icu locale from template database with icu provider');
 }
 else
 {

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@`
`71`	`71`	`$node2->command_ok(`
`72`	`72`	`[ 'createdb', '-T', 'template0', '--locale-provider=libc', 'foobar55' ],`
`73`	`73`	`'create database with libc provider from template database with icu provider');`
	`74`	`+`
	`75`	`+ $node2->command_ok(`
	`76`	`+ [ 'createdb', '-T', 'template0', '--icu-locale', 'en-US', 'foobar56' ],`
	`77`	`+ 'create database with icu locale from template database with icu provider');`
`74`	`78`	`}`
`75`	`79`	`else`
`76`	`80`	`{`