Commit2392136

committed

In pg_upgrade cross-version test, handle lack of oldstyle_length().

This suffices for testing v12 -> v13; some other version pairs need morechanges. Back-patch to v10, which removed the function.

1 parent5253906 commit2392136Copy full SHA for 2392136

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,17 +169,17 @@ createdb "regression$dbname3" \|\| createdb_status=$?`
`169`	`169`	`if"$MAKE" -C"$oldsrc" installcheck-parallel;then`
`170`	`170`	oldpgversion=`psql -X -A -t -d regression -c"SHOW server_version_num"`
`171`	`171`
`172`		`-# before dumping, get rid of objects notexisting in later versions`
	`172`	`+# before dumping, get rid of objects notfeasible in later versions`
`173`	`173`	`if ["$newsrc"!="$oldsrc" ];then`
`174`	`174`	`fix_sql=""`
`175`	`175`	`case$oldpgversionin`
`176`	`176`	`804??)`
`177`		`-fix_sql="DROP FUNCTION public.myfunc(integer); DROP FUNCTION public.oldstyle_length(integer, text);"`
`178`		`-;;`
`179`		`-*)`
`180`		`-fix_sql="DROP FUNCTION public.oldstyle_length(integer, text);"`
	`177`	`+fix_sql="DROP FUNCTION public.myfunc(integer);"`
`181`	`178`	`;;`
`182`	`179`	`esac`
	`180`	`+fix_sql="$fix_sql`
	`181`	`+ DROP FUNCTION IF EXISTS`
	`182`	`+public.oldstyle_length(integer, text);-- last in 9.6";`
`183`	`183`	`psql -X -d regression -c"$fix_sql;"\|\| psql_fix_sql_status=$?`
`184`	`184`	`fi`
`185`	`185`

Comments

(0)