Fix cross-version upgrade tests after f0827b4.

tglsfdc · tglsfdc · commit e8aecc5c2ce1 · 2024-02-28T17:47:25.000-05:00
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
@@ -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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,13 @@ sub adjust_database_contents`
`106`	`106`	`'drop extension if exists test_ext7');`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ # we removed this test-support function in v17`
	`110`	`+ if ($old_version >= 15 && $old_version < 17)`
	`111`	`+ {`
	`112`	`+ _add_st($result, 'regression',`
	`113`	`+ 'drop function get_columns_length(oid[])');`
	`114`	`+ }`
	`115`	`+`
`109`	`116`	`# stuff not supported from release 16`
`110`	`117`	`if ($old_version >= 12 && $old_version < 16)`
`111`	`118`	`{`