From 7129a9791eafdd825eae0187b7dd7b99ed48fdc7 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 15 Apr 2022 18:31:01 -0400 Subject: [PATCH] psql: fix \l display for pre-v15 databases. With a pre-v15 server, show NULL for the "ICU Locale" column, matching what you see in v15 when the database locale isn't ICU. The previous coding incorrectly repeated datcollate here. (There's an unfinished discussion about whether to consolidate these columns in \l output, but in any case we'd want this fix for \l+ output.) Euler Taveira, per report from Christoph Berg Discussion: https://postgr.es/m/YlmIFCqu+TZSW4rB@msg.df7cb.de --- src/bin/psql/describe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 839f1add900..583817b0cc6 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -904,7 +904,7 @@ listAllDbs(const char *pattern, bool verbose) gettext_noop("Locale Provider")); else appendPQExpBuffer(&buf, - " d.datcollate as \"%s\",\n" + " NULL as \"%s\",\n" " 'libc' AS \"%s\",\n", gettext_noop("ICU Locale"), gettext_noop("Locale Provider"));