summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2024-11-11 18:57:21 +0000
committerTom Lane2024-11-11 18:57:21 +0000
commitc4252c9ef0afea48a59402901c16fc970d838721 (patch)
treec3d9abc0d265fff794d407d441f527d36d55f6a8
parenta34c33fd2278157de140608523598567bfb7a32f (diff)
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.out2
-rw-r--r--src/pl/plperl/sql/plperl_env.sql3
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();