diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2024-03-12 15:24:03 -0700 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2024-03-12 15:24:03 -0700 |
| commit | 32dd2c1eff540e454d50a1d59d2d90ab6e70e0b6 (patch) | |
| tree | 9b3b12222d00c10a4b0c65bfdeb03ce752f1e1ac | |
| parent | 6ee3261e9bb6f0aa30ec74896c57f69b0636bfdd (diff) | |
| download | postgresql-32dd2c1eff540e454d50a1d59d2d90ab6e70e0b6.tar.gz postgresql-32dd2c1eff540e454d50a1d59d2d90ab6e70e0b6.zip | |
Fix version check in 002_pg_upgrade.pl.
Commit f696c0cd5f tried to account for the version in a way that
includes development versions, but it was broken. Fix with suggestion
from Tom Lane.
Discussion: https://postgr.es/m/1553991.1710191312@sss.pgh.pa.us
Reported-by: Tom Lane
| -rw-r--r-- | src/bin/pg_upgrade/t/002_pg_upgrade.pl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl index 5ef78691cb3..34a459496e1 100644 --- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl +++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl @@ -92,10 +92,6 @@ my $oldnode = PostgreSQL::Test::Cluster->new('old_node', install_path => $ENV{oldinstall}); -# Numeric major version of old cluster, ignoring "devel" suffix. -# Needed for testing upgrades from development version to itself. -my $old_major_version = int($oldnode->pg_version =~ s/devel//rg); - my %node_params = (); # To increase coverage of non-standard segment size and group access without @@ -118,10 +114,10 @@ my $original_locale = "C"; my $original_datlocale = ""; my $provider_field = "'c' AS datlocprovider"; my $old_datlocale_field = "NULL AS datlocale"; -if ($old_major_version >= 15 && $ENV{with_icu} eq 'yes') +if ($oldnode->pg_version >= 15 && $ENV{with_icu} eq 'yes') { $provider_field = "datlocprovider"; - if ($old_major_version >= 17) + if ($oldnode->pg_version >= '17devel') { $old_datlocale_field = "datlocale"; } |