Further fix pg_upgrade crossversion test for adminpack.

tglsfdc · tglsfdc · commit c8a61e350db4 · 2024-03-04T11:31:32.000-05:00
The DROP DATABASE step needs an "if exists" option, as the oldest branches we test don't have the contrib_regression_adminpack DB. Also remove unnecessary command to drop the extension from the regression database; no version has installed it there during buildfarm testing. 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
@@ -109,10 +109,8 @@ sub adjust_database_contents
 	# we removed the adminpack extension in v17
 	if ($old_version < 17)
 	{
-		_add_st($result, 'regression',
-			'drop extension if exists adminpack');
 		_add_st($result, 'postgres',
-			'drop database contrib_regression_adminpack');
+			'drop database if exists contrib_regression_adminpack');
 		delete($dbnames{'contrib_regression_adminpack'});
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,8 @@ sub adjust_database_contents`
`109`	`109`	`# we removed the adminpack extension in v17`
`110`	`110`	`if ($old_version < 17)`
`111`	`111`	`{`
`112`		`- _add_st($result, 'regression',`
`113`		`- 'drop extension if exists adminpack');`
`114`	`112`	`_add_st($result, 'postgres',`
`115`		`- 'drop database contrib_regression_adminpack');`
	`113`	`+ 'drop database if exists contrib_regression_adminpack');`
`116`	`114`	`delete($dbnames{'contrib_regression_adminpack'});`
`117`	`115`	`}`
`118`	`116`