Fix any operators with empty arrays and objects.

Author: akorotkov

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)

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  */
 						}
 					}
 				}

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;