Commit635140a

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 parent9ad2689 commit635140aCopy full SHA for 635140a

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

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

Comments

(0)