Simplify and merge unwanted-module drop logic in AdjustUpgrade.pm.

tglsfdc · tglsfdc · commit 519443162dce · 2024-03-09T16:20:44.000-05:00
In be78006 and followups, we failed to notice that there was already a better way to do it: instead of using DROP DATABASE IF EXISTS, we can check the list of existing DBs. Also, there seems no reason not to merge this into the pre-existing code for getting rid of unwanted module databases. Discussion: https://postgr.es/m/1066872.1710006597@sss.pgh.pa.us
diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -86,14 +86,20 @@ sub adjust_database_contents
 
 	# remove dbs of modules known to cause pg_upgrade to fail
 	# anything not builtin and incompatible should clean up its own db
-	foreach my $bad_module ('test_ddl_deparse', 'tsearch2')
+	foreach my $bad_module ('adminpack', 'test_ddl_deparse', 'tsearch2')
 	{
 		if ($dbnames{"contrib_regression_$bad_module"})
 		{
 			_add_st($result, 'postgres',
 				"drop database contrib_regression_$bad_module");
 			delete($dbnames{"contrib_regression_$bad_module"});
 		}
+		if ($dbnames{"regression_$bad_module"})
+		{
+			_add_st($result, 'postgres',
+				"drop database regression_$bad_module");
+			delete($dbnames{"regression_$bad_module"});
+		}
 	}
 
 	# avoid no-path-to-downgrade-extension-version issues
@@ -106,17 +112,6 @@ sub adjust_database_contents
 			'drop extension if exists test_ext7');
 	}
 
-	# we removed the adminpack extension in v17
-	if ($old_version < 17)
-	{
-		_add_st($result, 'postgres',
-			'drop database if exists contrib_regression_adminpack');
-		_add_st($result, 'postgres',
-			'drop database if exists regression_adminpack');
-		delete($dbnames{'contrib_regression_adminpack'});
-		delete($dbnames{'regression_adminpack'});
-	}
-
 	# we removed this test-support function in v17
 	if ($old_version >= 15 && $old_version < 17)
 	{
