Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ab22b14

Browse files
committed
Do jsonb regression test input in the conventional way.
This should make the buildfarm happier.
1 parent ca07cd5 commit ab22b14

File tree

9 files changed

+13
-8
lines changed

9 files changed

+13
-8
lines changed

src/test/regress/expected/create_table.out

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ CREATE TABLE array_index_op_test (
196196
i int4[],
197197
t text[]
198198
);
199+
CREATE TABLE testjsonb (
200+
j jsonb
201+
);
199202
CREATE TABLE IF NOT EXISTS test_tsvector(
200203
t text,
201204
a tsvector

src/test/regress/expected/jsonb.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,6 @@ SELECT '{"x":"y"}'::jsonb <> '{"x":"z"}'::jsonb;
457457
t
458458
(1 row)
459459

460-
CREATE TABLE testjsonb (j jsonb);
461-
\copy testjsonb FROM 'data/jsonb.data'
462460
-- containment
463461
SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b"}');
464462
jsonb_contains

src/test/regress/expected/jsonb_1.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,6 @@ SELECT '{"x":"y"}'::jsonb <> '{"x":"z"}'::jsonb;
457457
t
458458
(1 row)
459459

460-
CREATE TABLE testjsonb (j jsonb);
461-
\copy testjsonb FROM 'data/jsonb.data'
462460
-- containment
463461
SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b"}');
464462
jsonb_contains

src/test/regress/expected/sanity_check.out

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ test_range_excl|t
160160
test_range_gist|t
161161
test_range_spgist|t
162162
test_tsvector|f
163+
testjsonb|f
163164
text_tbl|f
164165
time_tbl|f
165166
timestamp_tbl|f

src/test/regress/input/copy.source

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ COPY hash_f8_heap FROM '@abs_srcdir@/data/hash.data';
4141

4242
COPY test_tsvector FROM '@abs_srcdir@/data/tsearch.data';
4343

44+
COPY testjsonb FROM '@abs_srcdir@/data/jsonb.data';
45+
4446
-- the data in this file has a lot of duplicates in the index key
4547
-- fields, leading to long bucket chains and lots of table expansion.
4648
-- this is therefore a stress test of the bucket overflow code (unlike

src/test/regress/output/copy.source

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ COPY hash_name_heap FROM '@abs_srcdir@/data/hash.data';
2222
COPY hash_txt_heap FROM '@abs_srcdir@/data/hash.data';
2323
COPY hash_f8_heap FROM '@abs_srcdir@/data/hash.data';
2424
COPY test_tsvector FROM '@abs_srcdir@/data/tsearch.data';
25+
COPY testjsonb FROM '@abs_srcdir@/data/jsonb.data';
2526
-- the data in this file has a lot of duplicates in the index key
2627
-- fields, leading to long bucket chains and lots of table expansion.
2728
-- this is therefore a stress test of the bucket overflow code (unlike

src/test/regress/output/misc.source

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,7 @@ SELECT user_relns() AS user_relns
680680
test_range_gist
681681
test_range_spgist
682682
test_tsvector
683+
testjsonb
683684
text_tbl
684685
time_tbl
685686
timestamp_tbl
@@ -697,7 +698,7 @@ SELECT user_relns() AS user_relns
697698
tvvmv
698699
varchar_tbl
699700
xacttest
700-
(119 rows)
701+
(120 rows)
701702

702703
SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
703704
name

src/test/regress/sql/create_table.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@ CREATE TABLE array_index_op_test (
232232
t text[]
233233
);
234234

235+
CREATE TABLE testjsonb (
236+
j jsonb
237+
);
238+
235239
CREATE TABLE IF NOT EXISTS test_tsvector(
236240
t text,
237241
a tsvector

src/test/regress/sql/jsonb.sql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ SELECT '{"x":"y"}'::jsonb = '{"x":"z"}'::jsonb;
115115
SELECT '{"x":"y"}'::jsonb <> '{"x":"y"}'::jsonb;
116116
SELECT '{"x":"y"}'::jsonb <> '{"x":"z"}'::jsonb;
117117

118-
CREATE TABLE testjsonb (j jsonb);
119-
\copy testjsonb FROM 'data/jsonb.data'
120-
121118
-- containment
122119
SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b"}');
123120
SELECT jsonb_contains('{"a":"b", "b":1, "c":null}', '{"a":"b", "c":null}');

0 commit comments

Comments
 (0)