database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Remove lc_ctype_is_c().

Browse Source 
Instead always fetch the locale and look at the ctype_is_c field.

hba.c relies on regexes working for the C locale without needing
catalog access, which worked before due to a special case for
C_COLLATION_OID in lc_ctype_is_c(). Move the special case to
pg_set_regex_collation() now that lc_ctype_is_c() is gone.

Author: Andreas Karlsson
Discussion: https://postgr.es/m/60929555-4709-40a7-b136-bcb44cff5a3c@proxel.se
This commit is contained in:
Jeff Davis
2024-09-06 13:23:21 -07:00
parent 129a2f6679
commit 51edc4ca54
7 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/utils/adt/formatting.c
View File

@ -1636,6 +1636,7 @@ char *
str_tolower(const char *buff, size_t nbytes, Oid collid)
{
char *result;
pg_locale_t mylocale;
if (!buff)
return NULL;
@ -1653,17 +1654,15 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
errhint("Use the COLLATE clause to set the collation explicitly.")));
}
mylocale = pg_newlocale_from_collation(collid);
/* C/POSIX collations use this path regardless of database encoding */
if (lc_ctype_is_c(collid))
if (mylocale->ctype_is_c)
{
result = asc_tolower(buff, nbytes);
}
else
{
pg_locale_t mylocale;
mylocale = pg_newlocale_from_collation(collid);
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{
@ -1774,6 +1773,7 @@ char *
str_toupper(const char *buff, size_t nbytes, Oid collid)
{
char *result;
pg_locale_t mylocale;
if (!buff)
return NULL;
@ -1791,17 +1791,15 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
errhint("Use the COLLATE clause to set the collation explicitly.")));
}
mylocale = pg_newlocale_from_collation(collid);
/* C/POSIX collations use this path regardless of database encoding */
if (lc_ctype_is_c(collid))
if (mylocale->ctype_is_c)
{
result = asc_toupper(buff, nbytes);
}
else
{
pg_locale_t mylocale;
mylocale = pg_newlocale_from_collation(collid);
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{
@ -1954,6 +1952,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
{
char *result;
int wasalnum = false;
pg_locale_t mylocale;
if (!buff)
return NULL;
@ -1971,17 +1970,15 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
errhint("Use the COLLATE clause to set the collation explicitly.")));
}
mylocale = pg_newlocale_from_collation(collid);
/* C/POSIX collations use this path regardless of database encoding */
if (lc_ctype_is_c(collid))
if (mylocale->ctype_is_c)
{
result = asc_initcap(buff, nbytes);
}
else
{
pg_locale_t mylocale;
mylocale = pg_newlocale_from_collation(collid);
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{