From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 28 Feb 2024 22:47:25 +0000 (-0500)
Subject: Fix cross-version upgrade tests after f0827b443.
X-Git-Tag: REL_17_BETA1~793
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8aecc5c2ce1d3b2b1b01bd770c14f5214c2a369;p=thirdparty%2Fpostgresql.git

Fix cross-version upgrade tests after f0827b443.

Removing the get_columns_length() function from regress.so
means we have to drop it when testing upgrades from versions
that had it.  Per buildfarm.

Discussion: https://postgr.es/m/2520881.1709159002@sss.pgh.pa.us
---

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index a6222ae14c2..c0da0aaff8a 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -106,6 +106,13 @@ sub adjust_database_contents
 			'drop extension if exists test_ext7');
 	}
 
+	# we removed this test-support function in v17
+	if ($old_version >= 15 && $old_version < 17)
+	{
+		_add_st($result, 'regression',
+			'drop function get_columns_length(oid[])');
+	}
+
 	# stuff not supported from release 16
 	if ($old_version >= 12 && $old_version < 16)
 	{