1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix parsing NOT sequence in tsquery

Browse Source 
Digging around bug #14245 I found that commit
6734a1cacd44f5b731933cbc93182b135b167d0c missed that NOT operation is
right associative in opposite to all other. This miss is resposible for
tsquery parser fail on sequence of NOT operations
This commit is contained in:
Teodor Sigaev 2016-07-15 20:01:41 +03:00
parent 19d290155d
commit 00f304ce2d
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/adt/tsquery.c
View File

@ -455,7 +455,9 @@ cleanOpStack(TSQueryParserState state,
while(*lenstack) while(*lenstack)
{ {
if (opPriority > OP_PRIORITY(stack[*lenstack - 1].op)) /* NOT is right associative unlike to others */
if ((op != OP_NOT && opPriority > OP_PRIORITY(stack[*lenstack - 1].op)) ||
(op == OP_NOT && opPriority >= OP_PRIORITY(stack[*lenstack - 1].op)))
break; break;
(*lenstack)--; (*lenstack)--;

36
src/test/regress/expected/tstypes.out
View File

@ -330,6 +330,42 @@ SELECT 'a:* & nbb:*ac | doo:a* | goo'::tsquery;
'a':* & 'nbb':*AC | 'doo':*A | 'goo' 'a':* & 'nbb':*AC | 'doo':*A | 'goo'
(1 row) (1 row)
SELECT '!!b'::tsquery;
tsquery
---------
!!'b'
(1 row)
SELECT '!!!b'::tsquery;
tsquery
---------
!!!'b'
(1 row)
SELECT '!(!b)'::tsquery;
tsquery
---------
!!'b'
(1 row)
SELECT 'a & !!b'::tsquery;
tsquery
-------------
'a' & !!'b'
(1 row)
SELECT '!!a & b'::tsquery;
tsquery
-------------
!!'a' & 'b'
(1 row)
SELECT '!!a & !!b'::tsquery;
tsquery
---------------
!!'a' & !!'b'
(1 row)
-- phrase transformation -- phrase transformation
SELECT 'a <-> (b|c)'::tsquery; SELECT 'a <-> (b|c)'::tsquery;
tsquery tsquery

6
src/test/regress/sql/tstypes.sql
View File

@ -57,6 +57,12 @@ SELECT '1&(2&(4&(5|!6)))'::tsquery;
SELECT E'1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery; SELECT E'1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery;
SELECT $$'\\as'$$::tsquery; SELECT $$'\\as'$$::tsquery;
SELECT 'a:* & nbb:*ac | doo:a* | goo'::tsquery; SELECT 'a:* & nbb:*ac | doo:a* | goo'::tsquery;
SELECT '!!b'::tsquery;
SELECT '!!!b'::tsquery;
SELECT '!(!b)'::tsquery;
SELECT 'a & !!b'::tsquery;
SELECT '!!a & b'::tsquery;
SELECT '!!a & !!b'::tsquery;
-- phrase transformation -- phrase transformation
SELECT 'a <-> (b|c)'::tsquery; SELECT 'a <-> (b|c)'::tsquery;