Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c8a61e3

Browse files
committed
Further fix pg_upgrade crossversion test for adminpack.
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
1 parent 084cff7 commit c8a61e3

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm

+1-3
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@ sub adjust_database_contents
109109
# we removed the adminpack extension in v17
110110
if ($old_version < 17)
111111
{
112-
_add_st($result, 'regression',
113-
'drop extension if exists adminpack');
114112
_add_st($result, 'postgres',
115-
'drop database contrib_regression_adminpack');
113+
'drop database if exists contrib_regression_adminpack');
116114
delete($dbnames{'contrib_regression_adminpack'});
117115
}
118116

0 commit comments

Comments
 (0)