diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/catalogs.sgml | 18 | ||||
| -rw-r--r-- | doc/src/sgml/ref/create_collation.sgml | 22 | ||||
| -rw-r--r-- | doc/src/sgml/ref/create_database.sgml | 14 | ||||
| -rw-r--r-- | doc/src/sgml/ref/createdb.sgml | 10 | ||||
| -rw-r--r-- | doc/src/sgml/ref/initdb.sgml | 10 |
5 files changed, 74 insertions, 0 deletions
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index c1e4048054e..746baf50538 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -2430,6 +2430,15 @@ SCRAM-SHA-256$<replaceable><iteration count></replaceable>:<replaceable>&l <row> <entry role="catalog_table_entry"><para role="column_definition"> + <structfield>collicurules</structfield> <type>text</type> + </para> + <para> + ICU collation rules for this collation object + </para></entry> + </row> + + <row> + <entry role="catalog_table_entry"><para role="column_definition"> <structfield>collversion</structfield> <type>text</type> </para> <para> @@ -3108,6 +3117,15 @@ SCRAM-SHA-256$<replaceable><iteration count></replaceable>:<replaceable>&l <row> <entry role="catalog_table_entry"><para role="column_definition"> + <structfield>daticurules</structfield> <type>text</type> + </para> + <para> + ICU collation rules for this database + </para></entry> + </row> + + <row> + <entry role="catalog_table_entry"><para role="column_definition"> <structfield>datcollversion</structfield> <type>text</type> </para> <para> diff --git a/doc/src/sgml/ref/create_collation.sgml b/doc/src/sgml/ref/create_collation.sgml index 136976165c2..289f8147f14 100644 --- a/doc/src/sgml/ref/create_collation.sgml +++ b/doc/src/sgml/ref/create_collation.sgml @@ -27,6 +27,7 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> ( [ LC_CTYPE = <replaceable>lc_ctype</replaceable>, ] [ PROVIDER = <replaceable>provider</replaceable>, ] [ DETERMINISTIC = <replaceable>boolean</replaceable>, ] + [ RULES = <replaceable>rules</replaceable>, ] [ VERSION = <replaceable>version</replaceable> ] ) CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replaceable>existing_collation</replaceable> @@ -150,6 +151,19 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace </varlistentry> <varlistentry> + <term><replaceable>rules</replaceable></term> + + <listitem> + <para> + Specifies additional collation rules to customize the behavior of the + collation. This is supported for ICU only. See <ulink + url="https://unicode-org.github.io/icu/userguide/collation/customization/"/> + for details on the syntax. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><replaceable>version</replaceable></term> <listitem> @@ -229,6 +243,14 @@ CREATE COLLATION german_phonebook (provider = icu, locale = 'de-u-co-phonebk'); </para> <para> + To create a collation using the ICU provider, based on the English ICU + locale, with custom rules: +<programlisting> +<![CDATA[CREATE COLLATION en_custom (provider = icu, locale = 'en', rules = '&a < g');]]> +</programlisting> + </para> + + <para> To create a collation from an existing collation: <programlisting> CREATE COLLATION german FROM "de_DE"; diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index 57d13e34c26..13793bb6b79 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -30,6 +30,7 @@ CREATE DATABASE <replaceable class="parameter">name</replaceable> [ LC_COLLATE [=] <replaceable class="parameter">lc_collate</replaceable> ] [ LC_CTYPE [=] <replaceable class="parameter">lc_ctype</replaceable> ] [ ICU_LOCALE [=] <replaceable class="parameter">icu_locale</replaceable> ] + [ ICU_RULES [=] <replaceable class="parameter">icu_rules</replaceable> ] [ LOCALE_PROVIDER [=] <replaceable class="parameter">locale_provider</replaceable> ] [ COLLATION_VERSION = <replaceable>collation_version</replaceable> ] [ TABLESPACE [=] <replaceable class="parameter">tablespace_name</replaceable> ] @@ -192,6 +193,19 @@ CREATE DATABASE <replaceable class="parameter">name</replaceable> </listitem> </varlistentry> + <varlistentry id="create-database-icu-rules"> + <term><replaceable class="parameter">icu_rules</replaceable></term> + <listitem> + <para> + Specifies additional collation rules to customize the behavior of the + default collation of this database. This is supported for ICU only. + See <ulink + url="https://unicode-org.github.io/icu/userguide/collation/customization/"/> + for details on the syntax. + </para> + </listitem> + </varlistentry> + <varlistentry id="create-database-locale-provider"> <term><replaceable>locale_provider</replaceable></term> diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml index 671cd362d94..e23419ba6cb 100644 --- a/doc/src/sgml/ref/createdb.sgml +++ b/doc/src/sgml/ref/createdb.sgml @@ -158,6 +158,16 @@ PostgreSQL documentation </varlistentry> <varlistentry> + <term><option>--icu-rules=<replaceable class="parameter">rules</replaceable></option></term> + <listitem> + <para> + Specifies additional collation rules to customize the behavior of the + default collation of this database. This is supported for ICU only. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>--locale-provider={<literal>libc</literal>|<literal>icu</literal>}</option></term> <listitem> <para> diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index 5b2bdac1015..c96164195d4 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -239,6 +239,16 @@ PostgreSQL documentation </listitem> </varlistentry> + <varlistentry id="app-initdb-icu-rules"> + <term><option>--icu-rules=<replaceable>rules</replaceable></option></term> + <listitem> + <para> + Specifies additional collation rules to customize the behavior of the + default collation. This is supported for ICU only. + </para> + </listitem> + </varlistentry> + <varlistentry id="app-initdb-data-checksums" xreflabel="data checksums"> <term><option>-k</option></term> <term><option>--data-checksums</option></term> |