Message-ID: <bca97aecb50b2026b7dbc26604bf31861c819a64.camel@j-davis.com>
Subject: Re: pgsql: Further further fix pg_upgrade crossversion test for
 adminpack.
From: Jeff Davis <pgsql@j-davis.com>
To: Tom Lane <tgl@sss.pgh.pa.us>, pgsql-committers@lists.postgresql.org
Date: Fri, 08 Mar 2024 23:48:08 -0800
In-Reply-To: <E1rhClo-0024Gh-8k@gemulon.postgresql.org>
References: <E1rhClo-0024Gh-8k@gemulon.postgresql.org>
Content-Type: multipart/mixed; boundary="=-eL2afCFvEvvASBGb8YCm"
User-Agent: Evolution 3.44.4-0ubuntu2 
MIME-Version: 1.0
Archived-At: 
 <https://www.postgresql.org/message-id/bca97aecb50b2026b7dbc26604bf31861c819a64.camel%40j-davis.com>
Precedence: bulk

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

On Mon, 2024-03-04 at 18:10 +0000, Tom Lane wrote:
> Further further fix pg_upgrade crossversion test for adminpack.

Ever since this commit the cross-version upgrade test is failing (for
me, at least) with:

# Running: psql -X -v ON_ERROR_STOP=3D1 -c drop database if exists
contrib_regression_adminpack;
drop database if exists regression_adminpack -d port=3D53977
host=3D/tmp/EK6UT_TufI dbname=3D'postgres'
ERROR:  DROP DATABASE cannot run inside a transaction block

It looks like when you added another command, the two were joined with
";\n", which ends up running the commands in a transaction block, which
doesn't work for DROP DATABASE.

I'm not sure how this test is succeeding for others, so perhaps I'm
doing something wrong?

Patch attached, though I'm not particularly great with perl and the
array flattening in my implementation might be too magical.

Regards,
	Jeff Davis


--=-eL2afCFvEvvASBGb8YCm
Content-Disposition: attachment;
 filename="0001-Fix-cross-version-pg_upgrade-test.patch"
Content-Type: text/x-patch;
 name="0001-Fix-cross-version-pg_upgrade-test.patch";
	charset="UTF-8"
Content-Transfer-Encoding: base64

RnJvbSA1NGUxM2RkYjAxYjg1OTYwNmViZTkzOGE5ODU4N2FlZjY2NmRmNjY4IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBG
cmksIDggTWFyIDIwMjQgMjM6Mzc6MTYgLTA4MDAKU3ViamVjdDogW1BBVENIXSBGaXggY3Jvc3Mt
dmVyc2lvbiBwZ191cGdyYWRlIHRlc3QuCgotLS0KIHNyYy9iaW4vcGdfdXBncmFkZS90LzAwMl9w
Z191cGdyYWRlLnBsIHwgOCArKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygr
KSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3VwZ3JhZGUvdC8wMDJf
cGdfdXBncmFkZS5wbCBiL3NyYy9iaW4vcGdfdXBncmFkZS90LzAwMl9wZ191cGdyYWRlLnBsCmlu
ZGV4IGQ5NTFlZDNhZjAuLjE2YjQyZDQ3NWYgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfdXBncmFk
ZS90LzAwMl9wZ191cGdyYWRlLnBsCisrKyBiL3NyYy9iaW4vcGdfdXBncmFkZS90LzAwMl9wZ191
cGdyYWRlLnBsCkBAIC0yNDYsMTUgKzI0NiwxOSBAQCBpZiAoZGVmaW5lZCgkRU5We29sZGluc3Rh
bGx9KSkKIAogCWZvcmVhY2ggbXkgJHVwZGIgKGtleXMgJSRhZGp1c3RfY21kcykKIAl7Ci0JCW15
ICR1cGNtZHMgPSBqb2luKCI7XG4iLCBAeyAkYWRqdXN0X2NtZHMtPnskdXBkYn0gfSk7CisJCW15
IEBjb21tYW5kX2FyZ3MgPSAoKTsKKwkJZm9yIG15ICR1cGNtZCAoQHsgJGFkanVzdF9jbWRzLT57
JHVwZGJ9IH0pCisJCXsKKwkJCXB1c2ggQGNvbW1hbmRfYXJncywgJy1jJywgJHVwY21kOworCQl9
CiAKIAkJIyBGb3Igc2ltcGxpY2l0eSwgdXNlIHRoZSBuZXdlciB2ZXJzaW9uJ3MgcHNxbCB0byBp
c3N1ZSB0aGUgY29tbWFuZHMuCiAJCSRuZXdub2RlLT5jb21tYW5kX29rKAogCQkJWwogCQkJCSdw
c3FsJywgJy1YJywKIAkJCQknLXYnLCAnT05fRVJST1JfU1RPUD0xJywKLQkJCQknLWMnLCAkdXBj
bWRzLAogCQkJCSctZCcsICRvbGRub2RlLT5jb25uc3RyKCR1cGRiKSwKKwkJCQlAY29tbWFuZF9h
cmdzLAogCQkJXSwKIAkJCSJyYW4gdmVyc2lvbiBhZGFwdGF0aW9uIGNvbW1hbmRzIGZvciBkYXRh
YmFzZSAkdXBkYiIpOwogCX0KLS0gCjIuMzQuMQoK


--=-eL2afCFvEvvASBGb8YCm--