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

Commit8461ab5

Browse files
committed
Update contrib for tsearch changes.
1 parent9263d86 commit8461ab5

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

‎contrib/test_parser/expected/test_parser.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SELECT * FROM ts_parse('testparser', 'That''s simple parser can''t parse urls li
3232
SELECT to_tsvector('testcfg','That''s my first own parser');
3333
to_tsvector
3434
-------------------------------------------------
35-
'my':2 'own':4 'first':3 'parser':5 'that''s':1
35+
'first':3 'my':2 'own':4 'parser':5 'that''s':1
3636
(1 row)
3737

3838
SELECT to_tsquery('testcfg', 'star');

‎contrib/tsearch2/expected/tsearch2.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ SELECT E'''1 \\''2'''::tsvector;
5151
SELECT E'''1 \\''2''3'::tsvector;
5252
tsvector
5353
-------------
54-
'3' '1 ''2'
54+
'1 ''2' '3'
5555
(1 row)
5656

5757
SELECT E'''1 \\''2'' 3'::tsvector;
5858
tsvector
5959
-------------
60-
'3' '1 ''2'
60+
'1 ''2' '3'
6161
(1 row)
6262

6363
SELECT E'''1 \\''2'' '' 3'' 4 '::tsvector;
6464
tsvector
6565
------------------
66-
'4' '3' '1 ''2'
66+
'3' '1 ''2' '4'
6767
(1 row)
6868

6969
select '''w'':4A,3B,2C,1D,5 a:8';
@@ -81,13 +81,13 @@ select 'a:3A b:2a'::tsvector || 'ba:1234 a:1B';
8181
select setweight('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd zxc:81,567,222A'::tsvector, 'c');
8282
setweight
8383
----------------------------------------------------------
84-
'a':1C,3C 'w':5C,6C,12C,13C 'asd':1C 'zxc':81C,222C,567C
84+
'a':1C,3C 'asd':1C 'w':5C,6C,12C,13C 'zxc':81C,222C,567C
8585
(1 row)
8686

8787
select strip('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd'::tsvector);
8888
strip
8989
---------------
90-
'a' 'w' 'asd'
90+
'a' 'asd' 'w'
9191
(1 row)
9292

9393
--tsquery
@@ -796,7 +796,7 @@ SELECT to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://aew.werc.
796796
<i <b> wow < jqw <> qwerty');
797797
to_tsvector
798798
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
799-
'ad':17 'dw':19 'jf':39 '234':61 '345':1 '4.2':54,55,56 '455':31 'jqw':64 'qwe':2,18,27,28,35 'wer':36 'wow':63 '-4.2':58,60 'asdf':37 'ewr1':43 'qwer':38 'sdjk':40 '5.005':32 'efd.r':3 'ewri2':44 'hjwer':42 'qwqwe':29 'wefjn':48 'gist.c':52 'gist.h':50 'qwerti':65 '234.435':30 'qwe-wer':34 'readlin':53,57,59 'www.com':4 '+4.0e-10':26 'gist.h.c':51 'rewt/ewr':47 '/?ad=qwe&dw':7,10,14,22 '/wqe-324/ewr':49 'aew.werc.ewr':6 '1aew.werc.ewr':9 '2aew.werc.ewr':11 '3aew.werc.ewr':13 '4aew.werc.ewr':15 '/usr/local/fff':45 '/awdf/dwqe/4325':46 'teodor@stack.net':33 '/?ad=qwe&dw=%20%32':25 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '7aew.werc.ewr:8100':24 'aew.werc.ewr/?ad=qwe&dw':5 '1aew.werc.ewr/?ad=qwe&dw':8 '3aew.werc.ewr/?ad=qwe&dw':12 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23
799+
'+4.0e-10':26 '-4.2':58,60 '/?ad=qwe&dw':7,10,14,22 '/?ad=qwe&dw=%20%32':25 '/awdf/dwqe/4325':46 '/usr/local/fff':45 '/wqe-324/ewr':49 '1aew.werc.ewr':9 '1aew.werc.ewr/?ad=qwe&dw':8 '234':61 '234.435':30 '2aew.werc.ewr':11 '345':1 '3aew.werc.ewr':13 '3aew.werc.ewr/?ad=qwe&dw':12 '4.2':54,55,56 '455':31 '4aew.werc.ewr':15 '5.005':32 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100':24 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23 'ad':17 'aew.werc.ewr':6 'aew.werc.ewr/?ad=qwe&dw':5 'asdf':37 'dw':19 'efd.r':3 'ewr1':43 'ewri2':44 'gist.c':52 'gist.h':50 'gist.h.c':51 'hjwer':42 'jf':39 'jqw':64 'qwe':2,18,27,28,35 'qwe-wer':34 'qwer':38 'qwerti':65 'qwqwe':29 'readlin':53,57,59 'rewt/ewr':47 'sdjk':40 'teodor@stack.net':33 'wefjn':48 'wer':36 'wow':63 'www.com':4
800800
(1 row)
801801

802802
SELECT length(to_tsvector('english', '345 qw'));
@@ -2429,8 +2429,8 @@ select a is null, a from test_tsvector order by a;
24292429
f |
24302430
f | 'a':1A,2,3B 'b':5A,6A,7C,8
24312431
f | 'a':1A,2,3C 'b':5A,6B,7C,8B
2432-
f | 'qq':7 'bar':2,8 'foo':1,3,6
2433-
f | '345':1 'qwerti':2 'copyright':3
2432+
f | 'bar':2,8 'foo':1,3,6 'qq':7
2433+
f | '345':1 'copyright':3 'qwerti':2
24342434
f | '7w' 'ch' 'd7' 'eo' 'gw' 'i4' 'lq' 'o6' 'qt' 'y0'
24352435
f | 'ar' 'ei' 'kq' 'ma' 'qa' 'qh' 'qq' 'qz' 'rx' 'st'
24362436
f | 'gs' 'i6' 'i9' 'j2' 'l0' 'oq' 'qx' 'sc' 'xe' 'yu'

‎contrib/tsearch2/tsearch2.sql.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.5 2008/04/14 17:05:32 tgl Exp $ */
1+
/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.6 2008/05/16 17:26:07 tgl Exp $ */
22

33
-- Adjust this setting to control where the objects get created.
44
SET search_path = public;
@@ -552,7 +552,7 @@ AS
552552
OPERATOR 2 @@@ (tsvector, tsquery),
553553
FUNCTION 1 bttextcmp(text, text),
554554
FUNCTION 2 gin_extract_tsvector(tsvector,internal),
555-
FUNCTION 3 gin_extract_tsquery(tsquery,internal,smallint),
555+
FUNCTION 3 gin_extract_tsquery(tsquery,internal,smallint,internal),
556556
FUNCTION 4 gin_tsquery_consistent(internal,smallint,tsquery,internal),
557557
STORAGE text;
558558

0 commit comments

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