Commita75f780

authored and

committed

Fix collation check in ICU-enabled build

1 parent901b585 commita75f780Copy full SHA for a75f780

File tree

-0

lines changed

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1574,6 +1574,14 @@ varstr_cmp(char arg1, int len1, char arg2, int len2, Oid collid)`
`1574`	`1574`	`#ifdefUSE_ICU`
`1575`	`1575`	`elseif (pg_database_encoding_max_length()>1)`
`1576`	`1576`	`{`
	`1577`	`+/*`
	`1578`	`+ * check collation as it done for regular way`
	`1579`	`+ */`
	`1580`	`+if (collid!=DEFAULT_COLLATION_OID&& !OidIsValid(collid))`
	`1581`	`+ereport(ERROR,`
	`1582`	`+(errcode(ERRCODE_INDETERMINATE_COLLATION),`
	`1583`	`+errmsg("could not determine which collation to use for string comparison"),`
	`1584`	`+errhint("Use the COLLATE clause to set the collation explicitly.")));`
`1577`	`1585`	`result=strcmp_icu(arg1,len1,arg2,len2);`
`1578`	`1586`	`}`
`1579`	`1587`	`#endif`

Comments

(0)