From: Andrew Dunstan <andrew@dunslane.net>
Date: Thu, 3 Jun 2021 20:08:33 +0000 (-0400)
Subject: In PostgresNode.pm, don't pass SQL to psql on the command line
X-Git-Tag: REL9_6_23~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=066535d411af6e77e06542d8a136576603164d5d;p=thirdparty%2Fpostgresql.git

In PostgresNode.pm, don't pass SQL to psql on the command line

The Msys shell mangles certain patterns in its command line, so avoid
handing arbitrary SQL to psql on the command line and instead use
IPC::Run's redirection facility for stdin. This pattern is already
mostly whats used, but query_poll_until() was not doing the right thing.

Problem discovered on the buildfarm when a new TAP test failed on msys.
---

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 377b8a1514d..5c5926559d9 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -1360,8 +1360,9 @@ sub poll_query_until
 	while ($attempts < $max_attempts)
 	{
 		my $cmd =
-		  [ 'psql', '-XAt', '-c', $query, '-d', $self->connstr($dbname) ];
-		my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
+		  [ 'psql', '-XAt', '-d', $self->connstr($dbname) ];
+		my $result = IPC::Run::run $cmd, '<', \$query,
+		  '>', \$stdout, '2>', \$stderr;
 
 		$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 		chomp($stdout);