Fix cross-version upgrade tests.

tglsfdc · tglsfdc · commit 8d19f3fea003 · 2024-11-11T13:57:21.000-05:00
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 b7e3a52 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
diff --git 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
@@ -56,3 +56,6 @@ $$
    }
 
 $$ LANGUAGE plperl;
+
+-- clean up to simplify cross-version upgrade testing
+DROP FUNCTION get_environ();

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,6 @@ $$`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`$$ LANGUAGE plperl;`
	`59`	`+`
	`60`	`+-- clean up to simplify cross-version upgrade testing`
	`61`	`+DROP FUNCTION get_environ();`