From d02f761d8e65b2f3014b4fddc3d6b73e34b26e8e Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Thu, 5 Apr 2018 11:38:11 -0700 Subject: [PATCH] Change intermediate_results test to not crash --- src/test/regress/expected/intermediate_results.out | 4 ++-- src/test/regress/pg_regress_multi.pl | 6 ++++-- src/test/regress/sql/intermediate_results.sql | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/test/regress/expected/intermediate_results.out b/src/test/regress/expected/intermediate_results.out index 065c27357..04d8f142d 100644 --- a/src/test/regress/expected/intermediate_results.out +++ b/src/test/regress/expected/intermediate_results.out @@ -230,8 +230,8 @@ END; -- pipe query output into a result file and create a table to check the result COPY (SELECT s, s*s FROM generate_series(1,5) s) TO PROGRAM - $$psql -h localhost -p 57636 -U postgres -d regression -c "BEGIN; COPY squares FROM STDIN WITH (format result); CREATE TABLE intermediate_results.squares AS SELECT * FROM read_intermediate_result('squares', 'binary') AS res(x int, x2 int); END;"$$ -WITH (FORMAT binary); + $$psql -h localhost -p 57636 -U postgres -d regression -c "BEGIN; COPY squares FROM STDIN WITH (format result); CREATE TABLE intermediate_results.squares AS SELECT * FROM read_intermediate_result('squares', 'text') AS res(x int, x2 int); END;"$$ +WITH (FORMAT text); SELECT * FROM squares ORDER BY x; x | x2 ---+---- diff --git a/src/test/regress/pg_regress_multi.pl b/src/test/regress/pg_regress_multi.pl index 958ddd8e5..e510c1acc 100755 --- a/src/test/regress/pg_regress_multi.pl +++ b/src/test/regress/pg_regress_multi.pl @@ -380,12 +380,14 @@ for my $workeroff (0 .. $#followerWorkerPorts) if ($usingWindows) { print $fh "--variable=dev_null=\"/nul\" "; - print $fh "--variable=temp_dir=\"%TEMP%\\\""; + print $fh "--variable=temp_dir=\"%TEMP%\" "; + print $fh "--variable=psql=\"".catfile($bindir, "psql")."\" "; } else { print $fh "--variable=dev_null=\"/dev/null\" "; - print $fh "--variable=temp_dir=\"/tmp/\""; + print $fh "--variable=temp_dir=\"/tmp/\" "; + print $fh "--variable=psql=\"psql\" "; } diff --git a/src/test/regress/sql/intermediate_results.sql b/src/test/regress/sql/intermediate_results.sql index 9f1e2a460..8fd4951f6 100644 --- a/src/test/regress/sql/intermediate_results.sql +++ b/src/test/regress/sql/intermediate_results.sql @@ -114,8 +114,8 @@ END; -- pipe query output into a result file and create a table to check the result COPY (SELECT s, s*s FROM generate_series(1,5) s) TO PROGRAM - $$psql -h localhost -p 57636 -U postgres -d regression -c "BEGIN; COPY squares FROM STDIN WITH (format result); CREATE TABLE intermediate_results.squares AS SELECT * FROM read_intermediate_result('squares', 'binary') AS res(x int, x2 int); END;"$$ -WITH (FORMAT binary); + $$psql -h localhost -p 57636 -U postgres -d regression -c "BEGIN; COPY squares FROM STDIN WITH (format result); CREATE TABLE intermediate_results.squares AS SELECT * FROM read_intermediate_result('squares', 'text') AS res(x int, x2 int); END;"$$ +WITH (FORMAT text); SELECT * FROM squares ORDER BY x;