Fix parsing NOT sequence in tsquery

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

diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index 72e608eb913738d0d4de9afd264fd2f1d98dcf86..ab4aa7ca2d6f193bc1bb64683b8e6ab7284f1c44 100644 (file)
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -455,7 +455,9 @@ cleanOpStack(TSQueryParserState state,
 
        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;
 
                (*lenstack)--;

diff --git a/src/test/regress/expected/tstypes.out b/src/test/regress/expected/tstypes.out
index 6705e6900fcca14c89001dcbb68bc2d7757d5919..886ea747f17733f6b38e15bbd48bbf43b55fa316 100644 (file)
--- a/src/test/regress/expected/tstypes.out
+++ b/src/test/regress/expected/tstypes.out
@@ -330,6 +330,42 @@ SELECT 'a:* & nbb:*ac | doo:a* | goo'::tsquery;
  'a':* & 'nbb':*AC | 'doo':*A | 'goo'
 (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
 SELECT 'a <-> (b|c)'::tsquery;
           tsquery          

diff --git a/src/test/regress/sql/tstypes.sql b/src/test/regress/sql/tstypes.sql
index abcf1504ce5386539b91295c3d113c166b27be1e..724234d94d25daae8dc7708f2c010791696579c1 100644 (file)
--- a/src/test/regress/sql/tstypes.sql
+++ b/src/test/regress/sql/tstypes.sql
@@ -57,6 +57,12 @@ SELECT '1&(2&(4&(5|!6)))'::tsquery;
 SELECT E'1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery;
 SELECT $$'\\as'$$::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
 SELECT 'a <-> (b|c)'::tsquery;