Disallow specifying ICU rules unless locale provider is ICU

petere · petere · commit 544b452a5a59 · 2023-03-09T08:09:40.000+01:00
Follow-up for 30a53b7; this was not checked in all cases. Reported-by: Jeff Davis <pgsql@j-davis.com>
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
@@ -271,6 +271,11 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("nondeterministic collations not supported with this provider")));
 
+		if (collicurules && collprovider != COLLPROVIDER_ICU)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("ICU rules cannot be specified unless locale provider is ICU")));
+
 		if (collprovider == COLLPROVIDER_ICU)
 		{
 #ifdef USE_ICU
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
@@ -1066,6 +1066,11 @@ 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 (dbicurules)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("ICU rules cannot be specified unless locale provider is ICU")));
 	}
 
 	/*
