Further further fix pg_upgrade crossversion test for adminpack.

tglsfdc · tglsfdc · commit cb6945dc8061 · 2024-03-04T13:10:30.000-05:00
Apparently, buildfarm animal crake has the adminpack regression DB named as "regression_adminpack" in some branches. Not clear why I didn't see that when testing here. In any case, drop that too. 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
@@ -111,7 +111,10 @@ sub adjust_database_contents
 	{
 		_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

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,10 @@ sub adjust_database_contents`
`111`	`111`	`{`
`112`	`112`	`_add_st($result, 'postgres',`
`113`	`113`	`'drop database if exists contrib_regression_adminpack');`
	`114`	`+ _add_st($result, 'postgres',`
	`115`	`+ 'drop database if exists regression_adminpack');`
`114`	`116`	`delete($dbnames{'contrib_regression_adminpack'});`
	`117`	`+ delete($dbnames{'regression_adminpack'});`
`115`	`118`	`}`
`116`	`119`
`117`	`120`	`# we removed this test-support function in v17`