Fix any operators with empty arrays and objects.

akorotkov · akorotkov · commit 75380d7b6269 · 2015-03-03T18:04:09.000+03:00
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -1239,28 +1239,28 @@ select 'a = /* noindex */ 5'::jsquery;
 (1 row)
 
 --ALL
-select 'a.*: = 4';
- ?column? 
-----------
- a.*: = 4
+select 'a.*: = 4'::jsquery;
+  jsquery   
+------------
+ "a".*: = 4
 (1 row)
 
-select '%: = 4';
- ?column? 
-----------
+select '%: = 4'::jsquery;
+ jsquery 
+---------
  %: = 4
 (1 row)
 
-select '#:.i = 4';
- ?column? 
-----------
- #:.i = 4
+select '#:.i = 4'::jsquery;
+  jsquery   
+------------
+ #:."i" = 4
 (1 row)
 
 select '[]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
  ?column? 
 ----------
- f
+ t
 (1 row)
 
 select '[2,3,4]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
@@ -1289,6 +1289,24 @@ select '[2,3,"x"]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
 
 select '{}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
  ?column? 
+----------
+ t
+(1 row)
+
+select '{}' @@ '*: ($ is object)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '"a"' @@ '*: is string'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '1' @@ '*: is string'::jsquery;
+ ?column? 
 ----------
  f
 (1 row)
diff --git a/jsquery_op.c b/jsquery_op.c
@@ -92,7 +92,7 @@ recursiveAny(JsQueryItem *jsq, JsonbValue *jb)
 static bool
 recursiveAll(JsQueryItem *jsq, JsonbValue *jb)
 {
-	bool			res = false;
+	bool			res = true;
 	JsonbIterator	*it;
 	int32			r;
 	JsonbValue		v;
@@ -436,6 +436,9 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb)
 				jsqGetNext(jsq, &elem);
 				it = JsonbIteratorInit(jb->val.binary.data);
 
+				if (jsq->type == jqiAllArray)
+					res = true;
+
 				while((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)
 				{
 					if (r == WJB_ELEM)
@@ -451,7 +454,6 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb)
 						{
 							if (res == false)
 								break;
-							res = true; /* if not executed at least one time  */
 						}
 					}
 				}
@@ -468,6 +470,9 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb)
 				jsqGetNext(jsq, &elem);
 				it = JsonbIteratorInit(jb->val.binary.data);
 
+				if (jsq->type == jqiAllKey)
+					res = true;
+
 				while((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)
 				{
 					if (r == WJB_VALUE)
@@ -483,7 +488,6 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb)
 						{
 							if (res == false)
 								break;
-							res = true; /* if not executed at least one time  */
 						}
 					}
 				}
diff --git a/sql/jsquery.sql b/sql/jsquery.sql
@@ -255,15 +255,18 @@ select 'a = /*-- noindex */ 5'::jsquery;
 select 'a = /* noindex */ 5'::jsquery;
 
 --ALL
-select 'a.*: = 4';
-select '%: = 4';
-select '#:.i = 4';
+select 'a.*: = 4'::jsquery;
+select '%: = 4'::jsquery;
+select '#:.i = 4'::jsquery;
 select '[]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
 select '[2,3,4]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
 select '[2,3,5]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
 select '[2,3,5]' @@ '# ($ > 1 and $ < 5)'::jsquery;
 select '[2,3,"x"]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
 select '{}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
+select '{}' @@ '*: ($ is object)'::jsquery;
+select '"a"' @@ '*: is string'::jsquery;
+select '1' @@ '*: is string'::jsquery;
 select '{"a":2,"b":3,"c":4}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
 select '{"a":2,"b":3,"c":5}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
 select '{"a":2,"b":3,"c":5}' @@ '% ($ > 1 and $ < 5)'::jsquery;

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ recursiveAny(JsQueryItem jsq, JsonbValue jb)`
`92`	`92`	`static bool`
`93`	`93`	`recursiveAll(JsQueryItem jsq, JsonbValue jb)`
`94`	`94`	`{`
`95`		`- bool res = false;`
	`95`	`+ bool res = true;`
`96`	`96`	`JsonbIterator *it;`
`97`	`97`	`int32 r;`
`98`	`98`	`JsonbValue v;`
`@@ -436,6 +436,9 @@ recursiveExecute(JsQueryItem jsq, JsonbValue jb)`
`436`	`436`	`jsqGetNext(jsq, &elem);`
`437`	`437`	`it = JsonbIteratorInit(jb->val.binary.data);`
`438`	`438`
	`439`	`+ if (jsq->type == jqiAllArray)`
	`440`	`+ res = true;`
	`441`	`+`
`439`	`442`	`while((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)`
`440`	`443`	`{`
`441`	`444`	`if (r == WJB_ELEM)`
`@@ -451,7 +454,6 @@ recursiveExecute(JsQueryItem jsq, JsonbValue jb)`
`451`	`454`	`{`
`452`	`455`	`if (res == false)`
`453`	`456`	`break;`
`454`		`- res = true; /* if not executed at least one time */`
`455`	`457`	`}`
`456`	`458`	`}`
`457`	`459`	`}`
`@@ -468,6 +470,9 @@ recursiveExecute(JsQueryItem jsq, JsonbValue jb)`
`468`	`470`	`jsqGetNext(jsq, &elem);`
`469`	`471`	`it = JsonbIteratorInit(jb->val.binary.data);`
`470`	`472`
	`473`	`+ if (jsq->type == jqiAllKey)`
	`474`	`+ res = true;`
	`475`	`+`
`471`	`476`	`while((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)`
`472`	`477`	`{`
`473`	`478`	`if (r == WJB_VALUE)`
`@@ -483,7 +488,6 @@ recursiveExecute(JsQueryItem jsq, JsonbValue jb)`
`483`	`488`	`{`
`484`	`489`	`if (res == false)`
`485`	`490`	`break;`
`486`		`- res = true; /* if not executed at least one time */`
`487`	`491`	`}`
`488`	`492`	`}`
`489`	`493`	`}`