diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2024-11-11 13:57:21 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2024-11-11 13:57:21 -0500 |
| commit | 8d19f3fea003b1f744516b84cbdb0097ae7b2912 (patch) | |
| tree | f11d22d96b8d11a0aa58b2fcdb03e787260a8d45 | |
| parent | 4cd4f3b97492c1b38115d0563a2e55b136eb542a (diff) | |
| download | postgresql-8d19f3fea003b1f744516b84cbdb0097ae7b2912.tar.gz postgresql-8d19f3fea003b1f744516b84cbdb0097ae7b2912.zip | |
Fix cross-version upgrade tests.
TestUpgradeXversion knows how to make the main regression database's
references to pg_regress.so be version-independent. But it doesn't
do that for plperl's database, so that the C function added by
commit b7e3a52a8 is causing cross-version upgrade test failures.
Path of least resistance is to just drop the function at the end
of the new test.
In <= v14, also take the opportunity to clean up the generated
test files.
Security: CVE-2024-10979
| -rw-r--r-- | src/pl/plperl/expected/plperl_env.out | 2 | ||||
| -rw-r--r-- | src/pl/plperl/sql/plperl_env.sql | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/pl/plperl/expected/plperl_env.out b/src/pl/plperl/expected/plperl_env.out index 328a5363421..f777c072b56 100644 --- a/src/pl/plperl/expected/plperl_env.out +++ b/src/pl/plperl/expected/plperl_env.out @@ -51,3 +51,5 @@ $$ $$ LANGUAGE plperl; WARNING: attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12. NOTICE: environ unaffected +-- clean up to simplify cross-version upgrade testing +DROP FUNCTION get_environ(); diff --git a/src/pl/plperl/sql/plperl_env.sql b/src/pl/plperl/sql/plperl_env.sql index 4108f392d1d..fa5f04146cc 100644 --- a/src/pl/plperl/sql/plperl_env.sql +++ b/src/pl/plperl/sql/plperl_env.sql @@ -56,3 +56,6 @@ $$ } $$ LANGUAGE plperl; + +-- clean up to simplify cross-version upgrade testing +DROP FUNCTION get_environ(); |