Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit01bb851

Browse files
committed
Make test of json(b)_to_tsvector language-independ
Missed in1c1791e commit
1 parent1c1791e commit01bb851

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎src/test/regress/expected/json.out

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,37 +2332,37 @@ select to_tsvector('english', '{"a": "aaa in bbb ddd ccc", "b": 123, "c": 456}':
23322332
(1 row)
23332333

23342334
-- json_to_tsvector
2335-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"all"');
2335+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"all"');
23362336
json_to_tsvector
23372337
----------------------------------------------------------------------------------------
23382338
'123':8 '456':12 'aaa':2 'b':6 'bbb':4 'c':10 'd':14 'f':18 'fals':20 'g':22 'true':16
23392339
(1 row)
23402340

2341-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"key"');
2341+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"key"');
23422342
json_to_tsvector
23432343
--------------------------------
23442344
'b':2 'c':4 'd':6 'f':8 'g':10
23452345
(1 row)
23462346

2347-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"string"');
2347+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"string"');
23482348
json_to_tsvector
23492349
------------------
23502350
'aaa':1 'bbb':3
23512351
(1 row)
23522352

2353-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"numeric"');
2353+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"numeric"');
23542354
json_to_tsvector
23552355
------------------
23562356
'123':1 '456':3
23572357
(1 row)
23582358

2359-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"boolean"');
2359+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '"boolean"');
23602360
json_to_tsvector
23612361
-------------------
23622362
'fals':3 'true':1
23632363
(1 row)
23642364

2365-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '["string", "numeric"]');
2365+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '["string", "numeric"]');
23662366
json_to_tsvector
23672367
---------------------------------
23682368
'123':5 '456':7 'aaa':1 'bbb':3
@@ -2454,21 +2454,21 @@ select json_to_tsvector('null'::json, '"all"');
24542454

24552455
(1 row)
24562456

2457-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '""');
2457+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '""');
24582458
ERROR: wrong flag in flag array: ""
24592459
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
2460-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '{}');
2460+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '{}');
24612461
ERROR: wrong flag type, only arrays and scalars are allowed
2462-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '[]');
2462+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '[]');
24632463
json_to_tsvector
24642464
------------------
24652465

24662466
(1 row)
24672467

2468-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, 'null');
2468+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, 'null');
24692469
ERROR: flag array element is not a string
24702470
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
2471-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '["all", null]');
2471+
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '["all", null]');
24722472
ERROR: flag array element is not a string
24732473
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
24742474
-- ts_headline for json

‎src/test/regress/expected/jsonb.out

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4130,37 +4130,37 @@ select to_tsvector('english', '{"a": "aaa in bbb ddd ccc", "b": 123, "c": 456}':
41304130
(1 row)
41314131

41324132
-- jsonb_to_tsvector
4133-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"all"');
4133+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"all"');
41344134
jsonb_to_tsvector
41354135
----------------------------------------------------------------------------------------
41364136
'123':8 '456':12 'aaa':2 'b':6 'bbb':4 'c':10 'd':14 'f':18 'fals':20 'g':22 'true':16
41374137
(1 row)
41384138

4139-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"key"');
4139+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"key"');
41404140
jsonb_to_tsvector
41414141
--------------------------------
41424142
'b':2 'c':4 'd':6 'f':8 'g':10
41434143
(1 row)
41444144

4145-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"string"');
4145+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"string"');
41464146
jsonb_to_tsvector
41474147
-------------------
41484148
'aaa':1 'bbb':3
41494149
(1 row)
41504150

4151-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"numeric"');
4151+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"numeric"');
41524152
jsonb_to_tsvector
41534153
-------------------
41544154
'123':1 '456':3
41554155
(1 row)
41564156

4157-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"boolean"');
4157+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '"boolean"');
41584158
jsonb_to_tsvector
41594159
-------------------
41604160
'fals':3 'true':1
41614161
(1 row)
41624162

4163-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["string", "numeric"]');
4163+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["string", "numeric"]');
41644164
jsonb_to_tsvector
41654165
---------------------------------
41664166
'123':5 '456':7 'aaa':1 'bbb':3
@@ -4252,21 +4252,21 @@ select jsonb_to_tsvector('null'::jsonb, '"all"');
42524252

42534253
(1 row)
42544254

4255-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
4255+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
42564256
ERROR: wrong flag in flag array: ""
42574257
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
4258-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
4258+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
42594259
ERROR: wrong flag type, only arrays and scalars are allowed
4260-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
4260+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
42614261
jsonb_to_tsvector
42624262
-------------------
42634263

42644264
(1 row)
42654265

4266-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
4266+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
42674267
ERROR: flag array element is not a string
42684268
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
4269-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
4269+
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
42704270
ERROR: flag array element is not a string
42714271
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
42724272
-- ts_headline for jsonb

‎src/test/regress/sql/json.sql

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -767,12 +767,12 @@ select to_tsvector('english', '{"a": "aaa in bbb ddd ccc", "b": ["the eee fff gg
767767
select to_tsvector('english','{"a": "aaa in bbb ddd ccc", "b": 123, "c": 456}'::json);
768768

769769
-- json_to_tsvector
770-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"all"');
771-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"key"');
772-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"string"');
773-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"numeric"');
774-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"boolean"');
775-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'["string", "numeric"]');
770+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"all"');
771+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"key"');
772+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"string"');
773+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"numeric"');
774+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"boolean"');
775+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'["string", "numeric"]');
776776

777777
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"all"');
778778
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'"key"');
@@ -793,11 +793,11 @@ select json_to_tsvector('{}'::json, '"all"');
793793
select json_to_tsvector('[]'::json,'"all"');
794794
select json_to_tsvector('null'::json,'"all"');
795795

796-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'""');
797-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'{}');
798-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'[]');
799-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'null');
800-
select json_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'["all", null]');
796+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'""');
797+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'{}');
798+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'[]');
799+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'null');
800+
select json_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json,'["all", null]');
801801

802802
-- ts_headline for json
803803
select ts_headline('{"a": "aaa bbb", "b": {"c": "ccc ddd fff", "c1": "ccc1 ddd1"}, "d": ["ggg hhh", "iii jjj"]}'::json, tsquery('bbb & ddd & hhh'));

‎src/test/regress/sql/jsonb.sql

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,12 +1093,12 @@ select to_tsvector('english', '{"a": "aaa in bbb ddd ccc", "b": ["the eee fff gg
10931093
select to_tsvector('english','{"a": "aaa in bbb ddd ccc", "b": 123, "c": 456}'::jsonb);
10941094

10951095
-- jsonb_to_tsvector
1096-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"all"');
1097-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"key"');
1098-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"string"');
1099-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"numeric"');
1100-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"boolean"');
1101-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'["string", "numeric"]');
1096+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"all"');
1097+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"key"');
1098+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"string"');
1099+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"numeric"');
1100+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"boolean"');
1101+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'["string", "numeric"]');
11021102

11031103
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"all"');
11041104
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'"key"');
@@ -1119,11 +1119,11 @@ select jsonb_to_tsvector('{}'::jsonb, '"all"');
11191119
select jsonb_to_tsvector('[]'::jsonb,'"all"');
11201120
select jsonb_to_tsvector('null'::jsonb,'"all"');
11211121

1122-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'""');
1123-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'{}');
1124-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'[]');
1125-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'null');
1126-
select jsonb_to_tsvector('{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'["all", null]');
1122+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'""');
1123+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'{}');
1124+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'[]');
1125+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'null');
1126+
select jsonb_to_tsvector('english','{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb,'["all", null]');
11271127

11281128
-- ts_headline for jsonb
11291129
select ts_headline('{"a": "aaa bbb", "b": {"c": "ccc ddd fff", "c1": "ccc1 ddd1"}, "d": ["ggg hhh", "iii jjj"]}'::jsonb, tsquery('bbb & ddd & hhh'));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp