Commit52202bb

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 parent107a2d4 commit52202bbCopy full SHA for 52202bb

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

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

Comments

(0)