From: Tom Lane <tgl@sss.pgh.pa.us>
To: Jeff Davis <pgsql@j-davis.com>
cc: pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Catalog changes preparing for builtin collation provider.
In-reply-to: <a4e4e1432c1c403318774f4b0c9b25a33e44e7fa.camel@j-davis.com>
References: <E1rj5WA-002z5V-WA@gemulon.postgresql.org>
 <8899c7c62b86370076110920686fd24863b69a01.camel@j-davis.com>
 <1222780.1710047108@sss.pgh.pa.us>
 <0ef325fa06e7a1605c4e119c4ecb637c67e5fb4e.camel@j-davis.com>
 <1553991.1710191312@sss.pgh.pa.us>
 <a4e4e1432c1c403318774f4b0c9b25a33e44e7fa.camel@j-davis.com>
Comments: In-reply-to Jeff Davis <pgsql@j-davis.com>
	message dated "Mon, 11 Mar 2024 15:51:31 -0700"
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Content-ID: <1738078.1710274545.0@sss.pgh.pa.us>
Date: Tue, 12 Mar 2024 16:16:17 -0400
Message-ID: <1738174.1710274577@sss.pgh.pa.us>
Archived-At: 
 <https://www.postgresql.org/message-id/1738174.1710274577%40sss.pgh.pa.us>
Precedence: bulk

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <1738078.1710274545.1@sss.pgh.pa.us>

Jeff Davis <pgsql@j-davis.com> writes:
> Patch attached, following the example in AdjustUpgrade.pm. It feels a
> bit inconsistent to sometimes use $oldnode->pg_version and sometimes
> use $old_major_version, but it's certainly better than what I had done
> in f696c0cd5f.

You're still doing it the hard way.  I suggest the attached.

			regards, tom lane


------- =_aaaaaaaaaa0
Content-Type: text/x-diff; name="simpler-version-check.patch";
	charset="us-ascii"
Content-ID: <1738078.1710274545.2@sss.pgh.pa.us>
Content-Description: simpler-version-check.patch
Content-Transfer-Encoding: quoted-printable

diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t=
/002_pg_upgrade.pl
index 5ef78691cb..34a459496e 100644
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -92,10 +92,6 @@ my $oldnode =3D
   PostgreSQL::Test::Cluster->new('old_node',
 	install_path =3D> $ENV{oldinstall});
 =

-# Numeric major version of old cluster, ignoring "devel" suffix.
-# Needed for testing upgrades from development version to itself.
-my $old_major_version =3D int($oldnode->pg_version =3D~ s/devel//rg);
-
 my %node_params =3D ();
 =

 # To increase coverage of non-standard segment size and group access with=
out
@@ -118,10 +114,10 @@ my $original_locale =3D "C";
 my $original_datlocale =3D "";
 my $provider_field =3D "'c' AS datlocprovider";
 my $old_datlocale_field =3D "NULL AS datlocale";
-if ($old_major_version >=3D 15 && $ENV{with_icu} eq 'yes')
+if ($oldnode->pg_version >=3D 15 && $ENV{with_icu} eq 'yes')
 {
 	$provider_field =3D "datlocprovider";
-	if ($old_major_version >=3D 17)
+	if ($oldnode->pg_version >=3D '17devel')
 	{
 		$old_datlocale_field =3D "datlocale";
 	}

------- =_aaaaaaaaaa0--