(cloudberry) 04/06: Fix MSVC pg_upgrade test.

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

reshke pushed a commit to branch REL_2_STABLE
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit 9c72478b3f827e0a92c26a8a59fc674ae685912e
Author: Nathan Bossart <na...@postgresql.org>
AuthorDate: Mon Aug 11 12:37:00 2025 -0500

    Fix MSVC pg_upgrade test.
    
    In the back-branch versions of commit 71ea0d6795, I missed updating
    this test to use --restrict-key so that the generated dump output
    is comparable.
    
    Per buildfarm member hamerkop.
    
    Reviewed-by: Tom Lane <tg...@sss.pgh.pa.us>
    Security: CVE-2025-8714
    Backpatch-through: 13-14
---
 src/tools/msvc/vcregress.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 0dc8e0519e6..7a80a4dd559 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -684,7 +684,7 @@ sub upgradecheck
 	# now we can chdir into the source dir
 	chdir "$topdir/src/bin/pg_upgrade";
 	print "\nDumping old cluster\n\n";
-	@args = ('pg_dumpall', '-f', "$tmp_root/dump1.sql");
+	@args = ('pg_dumpall', '-f', "$tmp_root/dump1.sql", '--restrict-key', 'test');
 	system(@args) == 0 or exit 1;
 	print "\nStopping old cluster\n\n";
 	system("pg_ctl stop") == 0 or exit 1;
@@ -698,7 +698,7 @@ sub upgradecheck
 	@args = ('pg_ctl', '-l', "$logdir/postmaster2.log", 'start');
 	system(@args) == 0 or exit 1;
 	print "\nDumping new cluster\n\n";
-	@args = ('pg_dumpall', '-f', "$tmp_root/dump2.sql");
+	@args = ('pg_dumpall', '-f', "$tmp_root/dump2.sql", '--restrict-key', 'test');
 	system(@args) == 0 or exit 1;
 	print "\nStopping new cluster\n\n";
 	system("pg_ctl stop") == 0 or exit 1;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org