Date: Sat, 25 Jun 2022 10:19:30 -0500
From: Justin Pryzby <pryzby@telsasoft.com>
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
Cc: Julien Rouhaud <rjuju123@gmail.com>, pgsql-hackers@postgresql.org,
	Daniel Verite <daniel@manitou-mail.org>
Subject: Re: ICU for global collation
Message-ID: <20220625151930.GH22452@telsasoft.com>
References: <20220111110852.t5oxfga57llm5cy2@jrouhaud>
 <a6f807c2-2d11-2cf6-a524-cfbec56e7d5b@enterprisedb.com>
 <20220118040246.dewl5pain2gkv2iv@jrouhaud>
 <171c5f7c-43ee-dbe9-31f9-5e3eb06a54cf@enterprisedb.com>
 <e381e36c-c7a2-2ec0-dbb4-da1dab3f0941@enterprisedb.com>
 <20220121135119.ywszwl4353v5dzh5@jrouhaud>
 <e2061949-f731-fd60-8b0b-3bae75095b4f@enterprisedb.com>
 <20220121161331.xn7fhtfg5j2ucilb@jrouhaud>
 <87e93704-b7f7-71f6-161d-8713e6334ed3@enterprisedb.com>
 <704405ed-f1fa-d2a7-b9f9-48a07fb45648@enterprisedb.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <704405ed-f1fa-d2a7-b9f9-48a07fb45648@enterprisedb.com>
User-Agent: Mutt/1.9.4 (2018-02-28)
Archived-At: 
 <https://www.postgresql.org/message-id/20220625151930.GH22452%40telsasoft.com>
Precedence: bulk

commit f2553d43060edb210b36c63187d52a632448e1d2 says >=1500 in a few places,
but in pg_upgrade says <=1500, which looks wrong for upgrades from v15.
I think it should say <= 1400.

On Wed, Feb 02, 2022 at 02:01:23PM +0100, Peter Eisentraut wrote:
> --- a/src/bin/pg_dump/pg_dump.c
> +++ b/src/bin/pg_dump/pg_dump.c
> @@ -2792,6 +2794,10 @@ dumpDatabase(Archive *fout)
>  		appendPQExpBuffer(dbQry, "datminmxid, ");
>  	else
>  		appendPQExpBuffer(dbQry, "0 AS datminmxid, ");
> +	if (fout->remoteVersion >= 150000)
> +		appendPQExpBuffer(dbQry, "datcollprovider, ");
> +	else
> +		appendPQExpBuffer(dbQry, "'c' AS datcollprovider, ");
>  	appendPQExpBuffer(dbQry,
>  					  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, "
>  					  "shobj_description(oid, 'pg_database') AS description "

> diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
> index 69ef23119f..2a9ca0e389 100644
> --- a/src/bin/pg_upgrade/info.c
> +++ b/src/bin/pg_upgrade/info.c
> @@ -312,11 +312,20 @@ get_db_infos(ClusterInfo *cluster)
>  				i_spclocation;
>  	char		query[QUERY_ALLOC];
>  
>  	snprintf(query, sizeof(query),
> -			 "SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, "
> +			 "SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, ");
> +	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1500)
> +		snprintf(query + strlen(query), sizeof(query) - strlen(query),
> +				 "'c' AS datcollprovider, NULL AS daticucoll, ");
> +	else
> +		snprintf(query + strlen(query), sizeof(query) - strlen(query),
> +				 "datcollprovider, daticucoll, ");
> +	snprintf(query + strlen(query), sizeof(query) - strlen(query),
>  			 "pg_catalog.pg_tablespace_location(t.oid) AS spclocation "
>  			 "FROM pg_catalog.pg_database d "
>  			 " LEFT OUTER JOIN pg_catalog.pg_tablespace t "

> --- a/src/bin/psql/describe.c
> +++ b/src/bin/psql/describe.c
> @@ -896,6 +896,18 @@ listAllDbs(const char *pattern, bool verbose)
>  					  gettext_noop("Encoding"),
>  					  gettext_noop("Collate"),
>  					  gettext_noop("Ctype"));
> +	if (pset.sversion >= 150000)
> +		appendPQExpBuffer(&buf,
> +						  "       d.daticucoll as \"%s\",\n"
> +						  "       CASE d.datcollprovider WHEN 'c' THEN 'libc' WHEN 'i' THEN 'icu' END AS \"%s\",\n",
> +						  gettext_noop("ICU Collation"),
> +						  gettext_noop("Coll. Provider"));
> +	else
> +		appendPQExpBuffer(&buf,
> +						  "       d.datcollate as \"%s\",\n"
> +						  "       'libc' AS \"%s\",\n",
> +						  gettext_noop("ICU Collation"),
> +						  gettext_noop("Coll. Provider"));
>  	appendPQExpBufferStr(&buf, "       ");
>  	printACLColumn(&buf, "d.datacl");
>  	if (verbose)

> @@ -4617,6 +4629,15 @@ listCollations(const char *pattern, bool verbose, bool showSystem)
>  					  gettext_noop("Collate"),
>  					  gettext_noop("Ctype"));
>  
> +	if (pset.sversion >= 150000)
> +		appendPQExpBuffer(&buf,
> +						  ",\n       c.collicucoll AS \"%s\"",
> +						  gettext_noop("ICU Collation"));
> +	else
> +		appendPQExpBuffer(&buf,
> +						  ",\n       c.collcollate AS \"%s\"",
> +						  gettext_noop("ICU Collation"));
> +
>  	if (pset.sversion >= 100000)
>  		appendPQExpBuffer(&buf,
>  						  ",\n       CASE c.collprovider WHEN 'd' THEN 'default' WHEN 'c' THEN 'libc' WHEN 'i' THEN 'icu' END AS \"%s\"",