From: Nathan Bossart <nathan@postgresql.org>
Date: Mon, 11 Aug 2025 17:37:00 +0000 (-0500)
Subject: Fix MSVC pg_upgrade test.
X-Git-Tag: REL_14_19~2
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=8967c33c67b85a33fee5ffb9bf16a67b640bacb8;p=postgresql.git

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 <tgl@sss.pgh.pa.us>
Security: CVE-2025-8714
Backpatch-through: 13-14
---

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 44f5b27900e..57b1a0c2213 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -675,7 +675,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;
@@ -689,7 +689,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;