Skip to content

Commit f7dd84d

Browse files
ildusildus
committed
Add pg12 support, and fix compilation for pg13
1 parent c347130 commit f7dd84d

20 files changed

+1190
-64
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,9 @@ env:
2626
- PG_VERSION=11 CHECK_CODE=clang
2727
- PG_VERSION=11 CHECK_CODE=cppcheck
2828
- PG_VERSION=11 CHECK_CODE=false
29+
- PG_VERSION=12 CHECK_CODE=clang
30+
- PG_VERSION=12 CHECK_CODE=cppcheck
31+
- PG_VERSION=12 CHECK_CODE=false
32+
- PG_VERSION=13 CHECK_CODE=clang
33+
- PG_VERSION=13 CHECK_CODE=cppcheck
34+
- PG_VERSION=13 CHECK_CODE=false

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ EXTENSION = tsvector2
77
EXTVERSION = 1.0
88
DATA_built = tsvector2--$(EXTVERSION).sql
99

10-
REGRESS = operators functions match rank json index_data search rum rum_hash
10+
REGRESS = operators functions match rank json json_flags index_data search rum rum_hash
1111

1212
EXTRA_CLEAN = tsvector2--$(EXTVERSION).sql
1313

‎expected/index_data.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ CREATE TABLE test_tsvector2(
33
t text,
44
a tsvector2
55
);
6-
COPY test_tsvector2 FROM '/home/ildus/pgpro/tsvector2/data/tsearch.data';
6+
COPY test_tsvector2 FROM '/home/ildus/dev/tsvector2/data/tsearch.data';
77
ANALYZE test_tsvector2;

‎expected/json.out‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,21 +150,4 @@ select jsonb_to_tsvector2('null'::jsonb, '"all"');
150150

151151
(1 row)
152152

153-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
154-
ERROR: wrong flag in flag array: ""
155-
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
156-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
157-
ERROR: wrong flag type, only arrays and scalars are allowed
158-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
159-
jsonb_to_tsvector2
160-
--------------------
161-
162-
(1 row)
163-
164-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
165-
ERROR: flag array element is not a string
166-
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
167-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
168-
ERROR: flag array element is not a string
169-
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
170153
DROP EXTENSION tsvector2;

‎expected/json_1.out‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -150,34 +150,4 @@ select jsonb_to_tsvector2('null'::jsonb, '"all"');
150150

151151
(1 row)
152152

153-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
154-
jsonb_to_tsvector2
155-
--------------------
156-
'aaa':1 'bbb':3
157-
(1 row)
158-
159-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
160-
jsonb_to_tsvector2
161-
--------------------
162-
'aaa':1 'bbb':3
163-
(1 row)
164-
165-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
166-
jsonb_to_tsvector2
167-
--------------------
168-
'aaa':1 'bbb':3
169-
(1 row)
170-
171-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
172-
jsonb_to_tsvector2
173-
--------------------
174-
'aaa':1 'bbb':3
175-
(1 row)
176-
177-
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
178-
jsonb_to_tsvector2
179-
--------------------
180-
'aaa':1 'bbb':3
181-
(1 row)
182-
183153
DROP EXTENSION tsvector2;

‎expected/json_flags.out‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
CREATE EXTENSION tsvector2;
2+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
3+
jsonb_to_tsvector2
4+
--------------------
5+
'aaa':1 'bbb':3
6+
(1 row)
7+
8+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
9+
jsonb_to_tsvector2
10+
--------------------
11+
'aaa':1 'bbb':3
12+
(1 row)
13+
14+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
15+
jsonb_to_tsvector2
16+
--------------------
17+
'aaa':1 'bbb':3
18+
(1 row)
19+
20+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
21+
jsonb_to_tsvector2
22+
--------------------
23+
'aaa':1 'bbb':3
24+
(1 row)
25+
26+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
27+
jsonb_to_tsvector2
28+
--------------------
29+
'aaa':1 'bbb':3
30+
(1 row)
31+
32+
DROP EXTENSION tsvector2;

‎expected/json_flags_1.out‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
CREATE EXTENSION tsvector2;
2+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
3+
ERROR: wrong flag in flag array: ""
4+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
5+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
6+
ERROR: wrong flag type, only arrays and scalars are allowed
7+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
8+
jsonb_to_tsvector2
9+
--------------------
10+
11+
(1 row)
12+
13+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
14+
ERROR: flag array element is not a string
15+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
16+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
17+
ERROR: flag array element is not a string
18+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
19+
DROP EXTENSION tsvector2;

‎expected/json_flags_2.out‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
CREATE EXTENSION tsvector2;
2+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
3+
ERROR: wrong flag in flag array: ""
4+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all".
5+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
6+
ERROR: wrong flag type, only arrays and scalars are allowed
7+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
8+
jsonb_to_tsvector2
9+
--------------------
10+
11+
(1 row)
12+
13+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
14+
ERROR: flag array element is not a string
15+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all".
16+
select jsonb_to_tsvector2('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
17+
ERROR: flag array element is not a string
18+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all".
19+
DROP EXTENSION tsvector2;

0 commit comments

Comments
 (0)