Date: Sun, 26 Jun 2022 11:51:24 +0800
From: Julien Rouhaud <rjuju123@gmail.com>
To: Justin Pryzby <pryzby@telsasoft.com>
Cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>,
	pgsql-hackers@postgresql.org,
	Daniel Verite <daniel@manitou-mail.org>
Subject: Re: ICU for global collation
Message-ID: <20220626035124.t36putp232nfl5im@jrouhaud>
References: <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>
 <20220625151930.GH22452@telsasoft.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220625151930.GH22452@telsasoft.com>
Archived-At: 
 <https://www.postgresql.org/message-id/20220626035124.t36putp232nfl5im%40jrouhaud>
Precedence: bulk

Hi,

On Sat, Jun 25, 2022 at 10:19:30AM -0500, Justin Pryzby wrote:
> 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:
> > 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 "

Indeed!