database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-19 17:02:53 +03:00
Code Activity

Special case C_COLLATION_OID in pg_newlocale_from_collation().

Browse Source 
Allow pg_newlocale_from_collation(C_COLLATION_OID) to work even if
there's no catalog access, which some extensions expect.

Not known to be a bug without extensions involved, but backport to 18.

Also corrects an issue in master with dummy_c_locale (introduced in
commit 5a38104b36) where deterministic was not set. That wasn't a bug,
but could have been if that structure was used more widely.

Reported-by: Alexander Kukushkin <cyberdemn@gmail.com>
Reviewed-by: Alexander Kukushkin <cyberdemn@gmail.com>
Discussion: https://postgr.es/m/CAFh8B=nj966ECv5vi_u3RYij12v0j-7NPZCXLYzNwOQp9AcPWQ@mail.gmail.com
Backpatch-through: 18
This commit is contained in:
Jeff Davis
2025-11-04 16:27:31 -08:00
parent 71aa2e1147
commit 3ebea75f9a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/utils/adt/pg_locale.c
View File

@@ -134,6 +134,13 @@ static pg_locale_t default_locale = NULL;
static bool CurrentLocaleConvValid = false; static bool CurrentLocaleConvValid = false;
static bool CurrentLCTimeValid = false; static bool CurrentLCTimeValid = false;
static struct pg_locale_struct c_locale = {
.provider = COLLPROVIDER_LIBC,
.deterministic = true,
.collate_is_c = true,
.ctype_is_c = true,
};
/* Cache for collation-related knowledge */ /* Cache for collation-related knowledge */
typedef struct typedef struct
@@ -1194,6 +1201,13 @@ pg_newlocale_from_collation(Oid collid)
if (collid == DEFAULT_COLLATION_OID) if (collid == DEFAULT_COLLATION_OID)
return default_locale; return default_locale;
/*
* Some callers expect C_COLLATION_OID to succeed even without catalog
* access.
*/
if (collid == C_COLLATION_OID)
return &c_locale;
if (!OidIsValid(collid)) if (!OidIsValid(collid))
elog(ERROR, "cache lookup failed for collation %u", collid); elog(ERROR, "cache lookup failed for collation %u", collid);