diff options
| author | Noah Misch <noah@leadboat.com> | 2020-12-30 01:43:43 -0800 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2020-12-30 01:43:46 -0800 |
| commit | 635140ace0b84aa5f177bddc368acb64f56a8e59 (patch) | |
| tree | 52f77884c15e60fcb093a062a9327dde96bd4ac1 | |
| parent | 9ad2689889ad47274550afadef430bc4929a9cd7 (diff) | |
| download | postgresql-635140ace0b84aa5f177bddc368acb64f56a8e59.tar.gz postgresql-635140ace0b84aa5f177bddc368acb64f56a8e59.zip | |
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.
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index ace9aa9bbd7..a5ae49571fd 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -168,17 +168,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 |