Commit 52202bb3 authored by Noah Misch's avatar Noah Misch

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

This suffices for testing v12 -> v13; some other version pairs need more
changes.  Back-patch to v10, which removed the function.
parent 107a2d42
......@@ -167,17 +167,17 @@ createdb "regression$dbname3" || createdb_status=$?
if "$MAKE" -C "$oldsrc" installcheck-parallel; then
oldpgversion=`psql -X -A -t -d regression -c "SHOW server_version_num"`
# before dumping, get rid of objects not existing in later versions
# before dumping, get rid of objects not feasible in later versions
if [ "$newsrc" != "$oldsrc" ]; then
fix_sql=""
case $oldpgversion in
804??)
fix_sql="DROP FUNCTION public.myfunc(integer); DROP FUNCTION public.oldstyle_length(integer, text);"
;;
*)
fix_sql="DROP FUNCTION public.oldstyle_length(integer, text);"
fix_sql="DROP FUNCTION public.myfunc(integer);"
;;
esac
fix_sql="$fix_sql
DROP FUNCTION IF EXISTS
public.oldstyle_length(integer, text); -- last in 9.6";
psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment