Message-ID: <a4e4e1432c1c403318774f4b0c9b25a33e44e7fa.camel@j-davis.com>
Subject: Re: pgsql: Catalog changes preparing for builtin collation provider.
From: Jeff Davis <pgsql@j-davis.com>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: pgsql-committers@lists.postgresql.org
Date: Mon, 11 Mar 2024 15:51:31 -0700
In-Reply-To: <1553991.1710191312@sss.pgh.pa.us>
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>
Content-Type: multipart/mixed; boundary="=-DauZVNo3i2L0kljRDCtI"
User-Agent: Evolution 3.44.4-0ubuntu2 
MIME-Version: 1.0
Archived-At: 
 <https://www.postgresql.org/message-id/a4e4e1432c1c403318774f4b0c9b25a33e44e7fa.camel%40j-davis.com>
Precedence: bulk

--=-DauZVNo3i2L0kljRDCtI
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, 2024-03-11 at 17:08 -0400, Tom Lane wrote:
> Jeff Davis <pgsql@j-davis.com> writes:
>=20
> was perfectly correct as it stood, because pg_version is a
> PostgreSQL::Version object.=C2=A0 Why did you feel a need to
> editorialize on that?

The goal was to do a version check for 17 that's inclusive of
development versions.

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.

Regards,
	Jeff Davis


--=-DauZVNo3i2L0kljRDCtI
Content-Disposition: attachment;
 filename="v1-0001-Another-fix-to-002_pg_upgrade.pl.patch"
Content-Type: text/x-patch;
 name="v1-0001-Another-fix-to-002_pg_upgrade.pl.patch";
	charset="UTF-8"
Content-Transfer-Encoding: base64

RnJvbSBhZDNiYTY2NzU1M2Q4YzI4NjJiNzQ5Mzk2NzYyNDQzNDA2MzFkMTkyIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBN
b24sIDExIE1hciAyMDI0IDE1OjMyOjQxIC0wNzAwClN1YmplY3Q6IFtQQVRDSCB2MV0gQW5vdGhl
ciBmaXggdG8gMDAyX3BnX3VwZ3JhZGUucGwuCgpQcm9wZXJseSB1c2UgUG9zdGdyZVNRTDo6VmVy
c2lvbiwgcmF0aGVyIHRoYW4gdGhlIGhhY2tzIGludHJvZHVjZWQgYnkKZjY5NmMwY2Q1Zi4KCkRp
c2N1c3Npb246IGh0dHBzOi8vcG9zdGdyLmVzL20vMTU1Mzk5MS4xNzEwMTkxMzEyQHNzcy5wZ2gu
cGEudXMKUmVwb3J0ZWQtYnk6IFRvbSBMYW5lCi0tLQogc3JjL2Jpbi9wZ191cGdyYWRlL3QvMDAy
X3BnX3VwZ3JhZGUucGwgfCA4ICsrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25z
KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfdXBncmFkZS90LzAw
Ml9wZ191cGdyYWRlLnBsIGIvc3JjL2Jpbi9wZ191cGdyYWRlL3QvMDAyX3BnX3VwZ3JhZGUucGwK
aW5kZXggNWVmNzg2OTFjYi4uMTgzMzUwNzBjOCAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ191cGdy
YWRlL3QvMDAyX3BnX3VwZ3JhZGUucGwKKysrIGIvc3JjL2Jpbi9wZ191cGdyYWRlL3QvMDAyX3Bn
X3VwZ3JhZGUucGwKQEAgLTkyLDkgKzkyLDkgQEAgbXkgJG9sZG5vZGUgPQogICBQb3N0Z3JlU1FM
OjpUZXN0OjpDbHVzdGVyLT5uZXcoJ29sZF9ub2RlJywKIAlpbnN0YWxsX3BhdGggPT4gJEVOVntv
bGRpbnN0YWxsfSk7CiAKLSMgTnVtZXJpYyBtYWpvciB2ZXJzaW9uIG9mIG9sZCBjbHVzdGVyLCBp
Z25vcmluZyAiZGV2ZWwiIHN1ZmZpeC4KLSMgTmVlZGVkIGZvciB0ZXN0aW5nIHVwZ3JhZGVzIGZy
b20gZGV2ZWxvcG1lbnQgdmVyc2lvbiB0byBpdHNlbGYuCi1teSAkb2xkX21ham9yX3ZlcnNpb24g
PSBpbnQoJG9sZG5vZGUtPnBnX3ZlcnNpb24gPX4gcy9kZXZlbC8vcmcpOworIyBOZWVkZWQgaW4g
c29tZSBjYXNlcyBmb3IgdGVzdGluZyB1cGdyYWRlcyBmcm9tIGEgZGV2ZWxvcG1lbnQgb3IgYmV0
YQorIyB2ZXJzaW9uIHRvIGl0c2VsZi4KK215ICRvbGRfbWFqb3JfdmVyc2lvbiA9IFBvc3RncmVT
UUw6OlZlcnNpb24tPm5ldygkb2xkbm9kZS0+cGdfdmVyc2lvbi0+bWFqb3IpOwogCiBteSAlbm9k
ZV9wYXJhbXMgPSAoKTsKIApAQCAtMTE4LDcgKzExOCw3IEBAIG15ICRvcmlnaW5hbF9sb2NhbGUg
PSAiQyI7CiBteSAkb3JpZ2luYWxfZGF0bG9jYWxlID0gIiI7CiBteSAkcHJvdmlkZXJfZmllbGQg
PSAiJ2MnIEFTIGRhdGxvY3Byb3ZpZGVyIjsKIG15ICRvbGRfZGF0bG9jYWxlX2ZpZWxkID0gIk5V
TEwgQVMgZGF0bG9jYWxlIjsKLWlmICgkb2xkX21ham9yX3ZlcnNpb24gPj0gMTUgJiYgJEVOVnt3
aXRoX2ljdX0gZXEgJ3llcycpCitpZiAoJG9sZG5vZGUtPnBnX3ZlcnNpb24gPj0gMTUgJiYgJEVO
Vnt3aXRoX2ljdX0gZXEgJ3llcycpCiB7CiAJJHByb3ZpZGVyX2ZpZWxkID0gImRhdGxvY3Byb3Zp
ZGVyIjsKIAlpZiAoJG9sZF9tYWpvcl92ZXJzaW9uID49IDE3KQotLSAKMi4zNC4xCgo=


--=-DauZVNo3i2L0kljRDCtI--