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 /src/bin/psql/describe.c | |
| 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 'src/bin/psql/describe.c')
| -rw-r--r-- | src/bin/psql/describe.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index c05befbb6f2..68b2ea8872a 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -937,14 +937,18 @@ listAllDbs(const char *pattern, bool verbose) " d.datctype as \"%s\",\n", gettext_noop("Collate"), gettext_noop("Ctype")); - if (pset.sversion >= 150000) + if (pset.sversion >= 170000) + appendPQExpBuffer(&buf, + " d.datlocale as \"%s\",\n", + gettext_noop("Locale")); + else if (pset.sversion >= 150000) appendPQExpBuffer(&buf, " d.daticulocale as \"%s\",\n", - gettext_noop("ICU Locale")); + gettext_noop("Locale")); else appendPQExpBuffer(&buf, " NULL as \"%s\",\n", - gettext_noop("ICU Locale")); + gettext_noop("Locale")); if (pset.sversion >= 160000) appendPQExpBuffer(&buf, " d.daticurules as \"%s\",\n", @@ -4983,14 +4987,18 @@ listCollations(const char *pattern, bool verbose, bool showSystem) gettext_noop("Collate"), gettext_noop("Ctype")); - if (pset.sversion >= 150000) + if (pset.sversion >= 170000) + appendPQExpBuffer(&buf, + " c.colllocale AS \"%s\",\n", + gettext_noop("Locale")); + else if (pset.sversion >= 150000) appendPQExpBuffer(&buf, " c.colliculocale AS \"%s\",\n", - gettext_noop("ICU Locale")); + gettext_noop("Locale")); else appendPQExpBuffer(&buf, " c.collcollate AS \"%s\",\n", - gettext_noop("ICU Locale")); + gettext_noop("Locale")); if (pset.sversion >= 160000) appendPQExpBuffer(&buf, |