Fix cross-version pg_upgrade test.

jeff-davis · jeff-davis · commit 5ba8b70debb1 · 2024-03-09T11:50:04.000-08:00
Pass each statement as a separate '-c' arg, so they don't get combined into a single transaction. Discussion: https://postgr.es/m/bca97aecb50b2026b7dbc26604bf31861c819a64.camel@j-davis.com Reviewed-by: Tom Lane
diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -246,15 +246,19 @@ sub filter_dump
 
 	foreach my $updb (keys %$adjust_cmds)
 	{
-		my $upcmds = join(";\n", @{ $adjust_cmds->{$updb} });
+		my @command_args = ();
+		for my $upcmd (@{ $adjust_cmds->{$updb} })
+		{
+			push @command_args, '-c', $upcmd;
+		}
 
 		# For simplicity, use the newer version's psql to issue the commands.
 		$newnode->command_ok(
 			[
 				'psql', '-X',
 				'-v', 'ON_ERROR_STOP=1',
-				'-c', $upcmds,
 				'-d', $oldnode->connstr($updb),
+				@command_args,
 			],
 			"ran version adaptation commands for database $updb");
 	}
