Commit32dd2c1

committed

Fix version check in 002_pg_upgrade.pl.

Commitf696c0c tried to account for the version in a way thatincludes development versions, but it was broken. Fix with suggestionfrom Tom Lane.Discussion:https://postgr.es/m/1553991.1710191312@sss.pgh.pa.usReported-by: Tom Lane

1 parent6ee3261 commit32dd2c1Copy full SHA for 32dd2c1

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,6 @@ sub filter_dump`
`92`	`92`	`PostgreSQL::Test::Cluster->new('old_node',`
`93`	`93`	`install_path=>$ENV{oldinstall});`
`94`	`94`
`95`		`-# Numeric major version of old cluster, ignoring "devel" suffix.`
`96`		`-# Needed for testing upgrades from development version to itself.`
`97`		`-my$old_major_version =int($oldnode->pg_version =~s/devel//rg);`
`98`		`-`
`99`	`95`	`my%node_params = ();`
`100`	`96`
`101`	`97`	`# To increase coverage of non-standard segment size and group access without`
`@@ -118,10 +114,10 @@ sub filter_dump`
`118`	`114`	`my$original_datlocale ="";`
`119`	`115`	`my$provider_field ="'c' AS datlocprovider";`
`120`	`116`	`my$old_datlocale_field ="NULL AS datlocale";`
`121`		`-if ($old_major_version >= 15 &&$ENV{with_icu}eq'yes')`
	`117`	`+if ($oldnode->pg_version >= 15 &&$ENV{with_icu}eq'yes')`
`122`	`118`	`{`
`123`	`119`	`$provider_field ="datlocprovider";`
`124`		`-if ($old_major_version >=17)`
	`120`	`+if ($oldnode->pg_version >='17devel')`
`125`	`121`	`{`
`126`	`122`	`$old_datlocale_field ="datlocale";`
`127`	`123`	`}`

Comments

(0)