Adjust pg_upgrade crossversion test for adminpack

danielgustafsson · danielgustafsson · commit be7800674117 · 2024-03-04T14:37:45.000+01:00
Commit cc09e65 which removed the adminpack extension failed to instrument the crossversion pg_upgrade test to drop the extension before attempting an upgrade to v17. Discussion: https://postgr.es/m/0CFB76D0-0510-48B2-9916-1199F93BC28C@yesql.se
diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -106,6 +106,16 @@ sub adjust_database_contents
 			'drop extension if exists test_ext7');
 	}
 
+	# we removed the adminpack extension in v17
+	if ($old_version >= 12 && $old_version < 17)
+	{
+		_add_st($result, 'regression',
+			'drop extension if exists adminpack');
+		_add_st($result, 'postgres',
+			'drop database contrib_regression_adminpack');
+		delete($dbnames{'contrib_regression_adminpack'});
+	}
+
 	# we removed this test-support function in v17
 	if ($old_version >= 15 && $old_version < 17)
 	{
