Commit46a44dc

committed

Use version for builtin collations.

Given that the version field already exists, there's little reason notto use it. Suggestion from Peter Eisentraut.Discussion:https://postgr.es/m/613c120a-5413-4fa7-a501-6590eae558f8@eisentraut.orgReviewed-by: Peter Eisentraut

1 parentc2df2ed commit46a44dcCopy full SHA for 46a44dc

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1732,13 +1732,23 @@ get_collation_actual_version(char collprovider, const char *collcollate)`
`1732`	`1732`
`1733`	`1733`	`/*`
`1734`	`1734`	`* The only two supported locales (C and C.UTF-8) are both based on memcmp`
`1735`		`- * and are not expected to change.`
	`1735`	`+ * and are not expected to change, but track the version anyway.`
`1736`	`1736`	`*`
`1737`	`1737`	`* Note that the character semantics may change for some locales, but the`
`1738`	`1738`	`* collation version only tracks changes to sort order.`
`1739`	`1739`	`*/`
`1740`	`1740`	`if (collprovider==COLLPROVIDER_BUILTIN)`
`1741`		`-returnNULL;`
	`1741`	`+{`
	`1742`	`+if (strcmp(collcollate,"C")==0)`
	`1743`	`+return"1";`
	`1744`	`+elseif (strcmp(collcollate,"C.UTF-8")==0)`
	`1745`	`+return"1";`
	`1746`	`+else`
	`1747`	`+ereport(ERROR,`
	`1748`	`+(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
	`1749`	`+errmsg("invalid locale name \"%s\" for builtin provider",`
	`1750`	`+collcollate)));`
	`1751`	`+}`
`1742`	`1752`
`1743`	`1753`	`#ifdefUSE_ICU`
`1744`	`1754`	`if (collprovider==COLLPROVIDER_ICU)`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@`
`25`	`25`	`collcollate => 'POSIX', collctype => 'POSIX' },`
`26`	`26`	`{ oid => '962', descr => 'sorts by Unicode code point, C character semantics',`
`27`	`27`	`collname => 'ucs_basic', collprovider => 'b', collencoding => '6',`
`28`		`- colllocale => 'C' },`
	`28`	`+ colllocale => 'C', collversion => '1' },`
`29`	`29`	`{ oid => '963',`
`30`	`30`	`descr => 'sorts using the Unicode Collation Algorithm with default settings',`
`31`	`31`	`collname => 'unicode', collprovider => 'i', collencoding => '-1',`
`32`	`32`	`colllocale => 'und' },`
`33`	`33`	`{ oid => '811', descr => 'sorts by Unicode code point; Unicode and POSIX character semantics',`
`34`	`34`	`collname => 'pg_c_utf8', collprovider => 'b', collencoding => '6',`
`35`		`- colllocale => 'C.UTF-8' },`
	`35`	`+ colllocale => 'C.UTF-8', collversion => '1' },`
`36`	`36`
`37`	`37`	`]`

Comments

(0)