Fix parsing NOT sequence in tsquery

feodor · feodor · commit 00f304ce2dd8 · 2016-07-15T20:01:41.000+03:00
Digging around bug #14245 I found that commit 6734a1c 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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,9 @@ cleanOpStack(TSQueryParserState state,`
`455`	`455`
`456`	`456`	`while(*lenstack)`
`457`	`457`	`{`
`458`		`- if (opPriority > OP_PRIORITY(stack[*lenstack - 1].op))`
	`458`	`+ /* NOT is right associative unlike to others */`
	`459`	`+ if ((op != OP_NOT && opPriority > OP_PRIORITY(stack[*lenstack - 1].op)) \|\|`
	`460`	`+ (op == OP_NOT && opPriority >= OP_PRIORITY(stack[*lenstack - 1].op)))`
`459`	`461`	`break;`
`460`	`462`
`461`	`463`	`(*lenstack)--;`