From ab22b149c60a10b842e3ec7fe3eb3b0b66c6611a Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Sun, 23 Mar 2014 20:18:06 -0400
Subject: [PATCH] Do jsonb regression test input in the conventional way.

This should make the buildfarm happier.
---
 src/test/regress/expected/create_table.out | 3 +++
 src/test/regress/expected/jsonb.out        | 2 --
 src/test/regress/expected/jsonb_1.out      | 2 --
 src/test/regress/expected/sanity_check.out | 1 +
 src/test/regress/input/copy.source         | 2 ++
 src/test/regress/output/copy.source        | 1 +
 src/test/regress/output/misc.source        | 3 ++-
 src/test/regress/sql/create_table.sql      | 4 ++++
 src/test/regress/sql/jsonb.sql             | 3 ---
 9 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index ade60c0258..167d02d039 100644
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -196,6 +196,9 @@ CREATE TABLE array_index_op_test (
 	i			int4[],
 	t			text[]
 );
+CREATE TABLE testjsonb (
+       j jsonb
+);
 CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text,
 	a tsvector
diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
index e25483d2f5..f368530a19 100644
--- a/src/test/regress/expected/jsonb.out
+++ b/src/test/regress/expected/jsonb.out
@@ -457,8 +457,6 @@ SELECT '{"x":"y"}'::jsonb <> '{"x":"z"}'::jsonb;
  t
 (1 row)
 
-CREATE TABLE testjsonb (j jsonb);
-\copy testjsonb FROM 'data/jsonb.data'
 -- containment
 SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b"}');
  jsonb_contains 
diff --git a/src/test/regress/expected/jsonb_1.out b/src/test/regress/expected/jsonb_1.out
index 06af5c8252..856c55af71 100644
--- a/src/test/regress/expected/jsonb_1.out
+++ b/src/test/regress/expected/jsonb_1.out
@@ -457,8 +457,6 @@ SELECT '{"x":"y"}'::jsonb <> '{"x":"z"}'::jsonb;
  t
 (1 row)
 
-CREATE TABLE testjsonb (j jsonb);
-\copy testjsonb FROM 'data/jsonb.data'
 -- containment
 SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b"}');
  jsonb_contains 
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index a62a3e3ebc..111d24ca6b 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -160,6 +160,7 @@ test_range_excl|t
 test_range_gist|t
 test_range_spgist|t
 test_tsvector|f
+testjsonb|f
 text_tbl|f
 time_tbl|f
 timestamp_tbl|f
diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source
index 80f911fea8..cb13606d14 100644
--- a/src/test/regress/input/copy.source
+++ b/src/test/regress/input/copy.source
@@ -41,6 +41,8 @@ COPY hash_f8_heap FROM '@abs_srcdir@/data/hash.data';
 
 COPY test_tsvector FROM '@abs_srcdir@/data/tsearch.data';
 
+COPY testjsonb FROM '@abs_srcdir@/data/jsonb.data';
+
 -- the data in this file has a lot of duplicates in the index key
 -- fields, leading to long bucket chains and lots of table expansion.
 -- this is therefore a stress test of the bucket overflow code (unlike
diff --git a/src/test/regress/output/copy.source b/src/test/regress/output/copy.source
index e8951c5b73..b7e372d61b 100644
--- a/src/test/regress/output/copy.source
+++ b/src/test/regress/output/copy.source
@@ -22,6 +22,7 @@ COPY hash_name_heap FROM '@abs_srcdir@/data/hash.data';
 COPY hash_txt_heap FROM '@abs_srcdir@/data/hash.data';
 COPY hash_f8_heap FROM '@abs_srcdir@/data/hash.data';
 COPY test_tsvector FROM '@abs_srcdir@/data/tsearch.data';
+COPY testjsonb FROM '@abs_srcdir@/data/jsonb.data';
 -- the data in this file has a lot of duplicates in the index key
 -- fields, leading to long bucket chains and lots of table expansion.
 -- this is therefore a stress test of the bucket overflow code (unlike
diff --git a/src/test/regress/output/misc.source b/src/test/regress/output/misc.source
index e194f7ed5c..7015bfda2c 100644
--- a/src/test/regress/output/misc.source
+++ b/src/test/regress/output/misc.source
@@ -680,6 +680,7 @@ SELECT user_relns() AS user_relns
  test_range_gist
  test_range_spgist
  test_tsvector
+ testjsonb
  text_tbl
  time_tbl
  timestamp_tbl
@@ -697,7 +698,7 @@ SELECT user_relns() AS user_relns
  tvvmv
  varchar_tbl
  xacttest
-(119 rows)
+(120 rows)
 
 SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
  name 
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index a050e8b6d1..8eb246b817 100644
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -232,6 +232,10 @@ CREATE TABLE array_index_op_test (
 	t			text[]
 );
 
+CREATE TABLE testjsonb (
+       j jsonb
+);
+
 CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text,
 	a tsvector
diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql
index 1ef49138bb..e460b1bb2a 100644
--- a/src/test/regress/sql/jsonb.sql
+++ b/src/test/regress/sql/jsonb.sql
@@ -115,9 +115,6 @@ SELECT '{"x":"y"}'::jsonb = '{"x":"z"}'::jsonb;
 SELECT '{"x":"y"}'::jsonb <> '{"x":"y"}'::jsonb;
 SELECT '{"x":"y"}'::jsonb <> '{"x":"z"}'::jsonb;
 
-CREATE TABLE testjsonb (j jsonb);
-\copy testjsonb FROM 'data/jsonb.data'
-
 -- containment
 SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b"}');
 SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b", "c":null}');