diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2024-03-09 14:48:18 -0800 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2024-03-09 14:48:18 -0800 |
| commit | f696c0cd5f299f1b51e214efc55a22a782cc175d (patch) | |
| tree | f834ff70d179f4d21f3def9ee8e4c4f1fe4922ad /doc/src | |
| parent | 81d13a8dc066e571dca032da0a5fc1d81214d2bb (diff) | |
| download | postgresql-f696c0cd5f299f1b51e214efc55a22a782cc175d.tar.gz postgresql-f696c0cd5f299f1b51e214efc55a22a782cc175d.zip | |
Catalog changes preparing for builtin collation provider.
Rename pg_collation.colliculocale to colllocale, and
pg_database.daticulocale to datlocale. These names reflects that the
fields will be useful for the upcoming builtin provider as well, not
just for ICU.
This is purely a rename; no changes to the meaning of the fields.
Discussion: https://postgr.es/m/ff4c2f2f9c8fc7ca27c1c24ae37ecaeaeaff6b53.camel%40j-davis.com
Reviewed-by: Peter Eisentraut
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/bki.sgml | 2 | ||||
| -rw-r--r-- | doc/src/sgml/catalogs.sgml | 26 |
2 files changed, 21 insertions, 7 deletions
diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml index 315ba819514..3cd5bee7ffa 100644 --- a/doc/src/sgml/bki.sgml +++ b/doc/src/sgml/bki.sgml @@ -186,7 +186,7 @@ datlocprovider => 'LOCALE_PROVIDER', datistemplate => 't', datallowconn => 't', dathasloginevt => 'f', datconnlimit => '-1', datfrozenxid => '0', datminmxid => '1', dattablespace => 'pg_default', datcollate => 'LC_COLLATE', - datctype => 'LC_CTYPE', daticulocale => 'ICU_LOCALE', datacl => '_null_' }, + datctype => 'LC_CTYPE', datlocale => 'DATLOCALE', datacl => '_null_' }, ] ]]></programlisting> diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 0ae97d1adaa..387a14b1869 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -2407,7 +2407,10 @@ SCRAM-SHA-256$<replaceable><iteration count></replaceable>:<replaceable>&l <structfield>collcollate</structfield> <type>text</type> </para> <para> - <symbol>LC_COLLATE</symbol> for this collation object + <symbol>LC_COLLATE</symbol> for this collation object. If the provider is + not <literal>libc</literal>, <structfield>collcollate</structfield> is + <literal>NULL</literal> and <structfield>colllocale</structfield> is + used instead. </para></entry> </row> @@ -2416,16 +2419,23 @@ SCRAM-SHA-256$<replaceable><iteration count></replaceable>:<replaceable>&l <structfield>collctype</structfield> <type>text</type> </para> <para> - <symbol>LC_CTYPE</symbol> for this collation object + <symbol>LC_CTYPE</symbol> for this collation object. If the provider is + not <literal>libc</literal>, <structfield>collctype</structfield> is + <literal>NULL</literal> and <structfield>colllocale</structfield> is + used instead. </para></entry> </row> <row> <entry role="catalog_table_entry"><para role="column_definition"> - <structfield>colliculocale</structfield> <type>text</type> + <structfield>colllocale</structfield> <type>text</type> </para> <para> - ICU locale ID for this collation object + Collation provider locale name for this collation object. If the + provider is <literal>libc</literal>, + <structfield>colllocale</structfield> is <literal>NULL</literal>; + <structfield>collcollate</structfield> and + <structfield>collctype</structfield> are used instead. </para></entry> </row> @@ -3131,10 +3141,14 @@ SCRAM-SHA-256$<replaceable><iteration count></replaceable>:<replaceable>&l <row> <entry role="catalog_table_entry"><para role="column_definition"> - <structfield>daticulocale</structfield> <type>text</type> + <structfield>datlocale</structfield> <type>text</type> </para> <para> - ICU locale ID for this database + Collation provider locale name for this database. If the + provider is <literal>libc</literal>, + <structfield>datlocale</structfield> is <literal>NULL</literal>; + <structfield>datcollate</structfield> and + <structfield>datctype</structfield> are used instead. </para></entry> </row> |