Commitca051d8

committed

Add collation versions for FreeBSD.

On FreeBSD 13, use querylocale() to read the current version of libccollations. Similar to commits352f6f2 for Windows andd5ac14f forGNU/Linux.Discussion:https://postgr.es/m/CAEepm%3D0uEQCpfq_%2BLYFBdArCe4Ot98t1aR4eYiYTe%3DyavQygiQ%40mail.gmail.com

1 parenta4ef032 commitca051d8Copy full SHA for ca051d8

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,8 @@ CREATE COLLATION ignore_accents (provider = icu, locale = 'und-u-ks-level1-kc-tr`
`973`	`973`	`Version information is available from the`
`974`	`974`	`<literal>icu</literal> provider on all operating systems. For the`
`975`	`975`	`<literal>libc</literal> provider, versions are currently only available`
`976`		`- on systems using the GNU C library (most Linux systems) and Windows.`
	`976`	`+ on systems using the GNU C library (most Linux systems), FreeBSD and`
	`977`	`+ Windows.`
`977`	`978`	`</para>`
`978`	`979`
`979`	`980`	`<note>`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1684,6 +1684,26 @@ get_collation_actual_version(char collprovider, const char *collcollate)`
`1684`	`1684`
`1685`	`1685`	`/* Use the glibc version because we don't have anything better. */`
`1686`	`1686`	`collversion=pstrdup(gnu_get_libc_version());`
	`1687`	`+#elif defined(LC_VERSION_MASK)`
	`1688`	`+locale_tloc;`
	`1689`	`+`
	`1690`	`+/* C[.encoding] and POSIX never change. */`
	`1691`	`+if (strcmp("C",collcollate)==0\|\|`
	`1692`	`+strncmp("C.",collcollate,2)==0\|\|`
	`1693`	`+strcmp("POSIX",collcollate)==0)`
	`1694`	`+returnNULL;`
	`1695`	`+`
	`1696`	`+/* Look up FreeBSD collation version. */`
	`1697`	`+loc=newlocale(LC_COLLATE,collcollate,NULL);`
	`1698`	`+if (loc)`
	`1699`	`+{`
	`1700`	`+collversion=`
	`1701`	`+pstrdup(querylocale(LC_COLLATE_MASK \|LC_VERSION_MASK,loc));`
	`1702`	`+freelocale(loc);`
	`1703`	`+}`
	`1704`	`+else`
	`1705`	`+ereport(ERROR,`
	`1706`	`+(errmsg("could not load locale \"%s\"",collcollate)));`
`1687`	`1707`	`#elif defined(WIN32)&&_WIN32_WINNT >=0x0600`
`1688`	`1708`	`/*`
`1689`	`1709`	`* If we are targeting Windows Vista and above, we can ask for a name`

Comments

(0)