From 01047903858963aa91dc9e230597e99df692332e Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Wed, 4 Apr 2018 18:37:41 -0700 Subject: [PATCH] Fix hard-coded temp directory in multi_copy /tmp does not exist on Windows, use :temp_dir instead --- src/test/regress/input/multi_copy.source | 8 ++++---- src/test/regress/output/multi_copy.source | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/regress/input/multi_copy.source b/src/test/regress/input/multi_copy.source index a48ec65ba..b8fc53f74 100644 --- a/src/test/regress/input/multi_copy.source +++ b/src/test/regress/input/multi_copy.source @@ -825,8 +825,8 @@ green {"r":0,"g":255,"b":0} SELECT * FROM copy_jsonb ORDER BY key; -- JSONB from binary should work -\COPY copy_jsonb TO '/tmp/copy_jsonb.pgcopy' WITH (format binary) -\COPY copy_jsonb FROM '/tmp/copy_jsonb.pgcopy' WITH (format binary) +COPY copy_jsonb TO :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); +COPY copy_jsonb FROM :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); SELECT * FROM copy_jsonb ORDER BY key; -- JSONB parsing error without validation: no line number @@ -845,8 +845,8 @@ green {"r":0,"g":255,"b":0} SELECT * FROM copy_jsonb ORDER BY key; -- JSONB from binary should work -\COPY copy_jsonb TO '/tmp/copy_jsonb.pgcopy' WITH (format binary) -\COPY copy_jsonb FROM '/tmp/copy_jsonb.pgcopy' WITH (format binary) +COPY copy_jsonb TO :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); +COPY copy_jsonb FROM :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); SELECT * FROM copy_jsonb ORDER BY key; -- JSONB parsing error with validation: should see line number diff --git a/src/test/regress/output/multi_copy.source b/src/test/regress/output/multi_copy.source index 32a57b05e..b45e5261a 100644 --- a/src/test/regress/output/multi_copy.source +++ b/src/test/regress/output/multi_copy.source @@ -1110,8 +1110,8 @@ SELECT * FROM copy_jsonb ORDER BY key; (2 rows) -- JSONB from binary should work -\COPY copy_jsonb TO '/tmp/copy_jsonb.pgcopy' WITH (format binary) -\COPY copy_jsonb FROM '/tmp/copy_jsonb.pgcopy' WITH (format binary) +COPY copy_jsonb TO :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); +COPY copy_jsonb FROM :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); SELECT * FROM copy_jsonb ORDER BY key; key | value | extra -------+----------------------------+------------- @@ -1139,8 +1139,8 @@ SELECT * FROM copy_jsonb ORDER BY key; (2 rows) -- JSONB from binary should work -\COPY copy_jsonb TO '/tmp/copy_jsonb.pgcopy' WITH (format binary) -\COPY copy_jsonb FROM '/tmp/copy_jsonb.pgcopy' WITH (format binary) +COPY copy_jsonb TO :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); +COPY copy_jsonb FROM :'temp_dir''copy_jsonb.pgcopy' WITH (format binary); SELECT * FROM copy_jsonb ORDER BY key; key | value | extra -------+----------------------------+-------------