Commit544b452

committed

Disallow specifying ICU rules unless locale provider is ICU

Follow-up for30a53b7; this was not checked in all cases.Reported-by: Jeff Davis <pgsql@j-davis.com>

1 parentb6dfee2 commit544b452Copy full SHA for 544b452

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,11 @@ DefineCollation(ParseState pstate, List names, List *parameters, bool if_not_e`
`271`	`271`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`272`	`272`	`errmsg("nondeterministic collations not supported with this provider")));`
`273`	`273`
	`274`	`+if (collicurules&&collprovider!=COLLPROVIDER_ICU)`
	`275`	`+ereport(ERROR,`
	`276`	`+(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
	`277`	`+errmsg("ICU rules cannot be specified unless locale provider is ICU")));`
	`278`	`+`
`274`	`279`	`if (collprovider==COLLPROVIDER_ICU)`
`275`	`280`	`{`
`276`	`281`	`#ifdefUSE_ICU`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1066,6 +1066,11 @@ createdb(ParseState pstate, const CreatedbStmt stmt)`
`1066`	`1066`	`ereport(ERROR,`
`1067`	`1067`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`1068`	`1068`	`errmsg("ICU locale cannot be specified unless locale provider is ICU")));`
	`1069`	`+`
	`1070`	`+if (dbicurules)`
	`1071`	`+ereport(ERROR,`
	`1072`	`+(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
	`1073`	`+errmsg("ICU rules cannot be specified unless locale provider is ICU")));`
`1069`	`1074`	`}`
`1070`	`1075`
`1071`	`1076`	`/*`

Comments

(0)