diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2024-03-04 11:31:32 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2024-03-04 11:31:32 -0500 |
| commit | c8a61e350db40f81e088f2333fd30cc7f96a8b35 (patch) | |
| tree | d6056972a695e762967778a9260baaea4890ff85 /src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | |
| parent | 084cff7899d62c142f5c5190ef6924a0ffe93893 (diff) | |
| download | postgresql-c8a61e350db40f81e088f2333fd30cc7f96a8b35.tar.gz postgresql-c8a61e350db40f81e088f2333fd30cc7f96a8b35.zip | |
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
Diffstat (limited to 'src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm')
| -rw-r--r-- | src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index e4a4dcbd0d2..211b71cb701 100644 --- 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'}); } |