From be7800674117756a63f3fee68ee4563eff303839 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Mon, 4 Mar 2024 14:37:45 +0100 Subject: [PATCH] Adjust pg_upgrade crossversion test for adminpack Commit cc09e6549f 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 --- src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index c0da0aaff8..8dc1a65e3d 100644 --- 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) {