mirror of
https://github.com/postgres/postgres.git
synced 2025-11-29 23:43:17 +03:00
Add collation support on Windows (MSVC build)
There is not yet support in initdb to populate the pg_collation catalog, but if that is done manually, the rest should work.
This commit is contained in:
@@ -971,8 +971,12 @@ pg_newlocale_from_collation(Oid collid)
|
||||
if (strcmp(collcollate, collctype) == 0)
|
||||
{
|
||||
/* Normal case where they're the same */
|
||||
#ifndef WIN32
|
||||
result = newlocale(LC_COLLATE_MASK | LC_CTYPE_MASK, collcollate,
|
||||
NULL);
|
||||
#else
|
||||
result = _create_locale(LC_ALL, collcollate);
|
||||
#endif
|
||||
if (!result)
|
||||
ereport(ERROR,
|
||||
(errcode_for_file_access(),
|
||||
@@ -981,6 +985,7 @@ pg_newlocale_from_collation(Oid collid)
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifndef WIN32
|
||||
/* We need two newlocale() steps */
|
||||
locale_t loc1;
|
||||
|
||||
@@ -996,6 +1001,16 @@ pg_newlocale_from_collation(Oid collid)
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not create locale \"%s\": %m",
|
||||
collctype)));
|
||||
#else
|
||||
/*
|
||||
* XXX The _create_locale() API doesn't appear to support
|
||||
* this. Could perhaps be worked around by changing
|
||||
* pg_locale_t to contain two separate fields.
|
||||
*/
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||
errmsg("collations with different collate and ctype values are not supported on this platform")));
|
||||
#endif
|
||||
}
|
||||
|
||||
cache_entry->locale = result;
|
||||
|
||||
@@ -1374,6 +1374,11 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid)
|
||||
((LPWSTR) a2p)[r] = 0;
|
||||
|
||||
errno = 0;
|
||||
#ifdef HAVE_LOCALE_T
|
||||
if (mylocale)
|
||||
result = wcscoll_l((LPWSTR) a1p, (LPWSTR) a2p, mylocale);
|
||||
else
|
||||
#endif
|
||||
result = wcscoll((LPWSTR) a1p, (LPWSTR) a2p);
|
||||
if (result == 2147483647) /* _NLSCMPERROR; missing from mingw
|
||||
* headers */
|
||||
|
||||
Reference in New Issue
Block a user