diff options
| author | Jeff Davis | 2024-09-06 20:23:21 +0000 |
|---|---|---|
| committer | Jeff Davis | 2024-09-06 20:23:21 +0000 |
| commit | 51edc4ca54f826cfac012c7306eee479f07a5dc7 (patch) | |
| tree | 0a3c3a700a4e317cec6231d0e14782928cc19639 /src/include | |
| parent | 129a2f6679fd8891384016b6e2cde6cefda22a7d (diff) | |
Remove lc_ctype_is_c().
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
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/pg_collation.dat | 3 | ||||
| -rw-r--r-- | src/include/utils/pg_locale.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/include/catalog/pg_collation.dat b/src/include/catalog/pg_collation.dat index f1262012760..af5c9aa5824 100644 --- a/src/include/catalog/pg_collation.dat +++ b/src/include/catalog/pg_collation.dat @@ -19,8 +19,7 @@ descr => 'standard C collation', collname => 'C', collprovider => 'c', collencoding => '-1', collcollate => 'C', collctype => 'C' }, -{ oid => '951', oid_symbol => 'POSIX_COLLATION_OID', - descr => 'standard POSIX collation', +{ oid => '951', descr => 'standard POSIX collation', collname => 'POSIX', collprovider => 'c', collencoding => '-1', collcollate => 'POSIX', collctype => 'POSIX' }, { oid => '962', descr => 'sorts by Unicode code point, C character semantics', diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 8ec24437f4d..ab1c37a44b3 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -54,8 +54,6 @@ extern PGDLLIMPORT bool database_ctype_is_c; extern bool check_locale(int category, const char *locale, char **canonname); extern char *pg_perm_setlocale(int category, const char *locale); -extern bool lc_ctype_is_c(Oid collation); - /* * Return the POSIX lconv struct (contains number/money formatting * information) with locale information for all categories. |