fix wrong output of filter in jsquery, improve tests

Author: feodor

Diff for: expected/jsquery.out

@@ -1454,21 +1454,21 @@ select '?( not b>0). x'::jsquery;
 (1 row)
 
 select 'a.?(b>0 and x= 0 ) .c'::jsquery;
-              jsquery              
------------------------------------
- "a" ?(("b" > 0 AND "x" = 0)) ."c"
+              jsquery               
+------------------------------------
+ "a". ?(("b" > 0 AND "x" = 0)) ."c"
 (1 row)
 
 select 'a.$. ?(b>0 and x= 0 ) . c.k'::jsquery;
-                 jsquery                 
------------------------------------------
- "a".$ ?(("b" > 0 AND "x" = 0)) ."c"."k"
+                 jsquery                  
+------------------------------------------
+ "a".$. ?(("b" > 0 AND "x" = 0)) ."c"."k"
 (1 row)
 
 select 'a.$.? (b>0 and x.*= 0 ).c.k'::jsquery;
-                  jsquery                  
--------------------------------------------
- "a".$ ?(("b" > 0 AND "x".* = 0)) ."c"."k"
+                  jsquery                   
+--------------------------------------------
+ "a".$. ?(("b" > 0 AND "x".* = 0)) ."c"."k"
 (1 row)
 
 select '[{"a":1, "b":10}, {"a":2, "b":20}, {"a":3, "b":30}]'::jsonb @@ '#. ?(a < 0) (b=20)';
@@ -1615,6 +1615,18 @@ select '{"a": {"b": {"c": 1}}}'::jsonb ~~ '?(*.c >0)';
  [{"a": {"b": {"c": 1}}}]
 (1 row)
 
+select '{"tags":[{"term":["NYC", "CYN"]}, {"term":["1NYC", "1CYN"]} ]}'::jsonb ~~ 'tags.#.term.#. ? ( $ = "NYC")';
+ ?column? 
+----------
+ ["NYC"]
+(1 row)
+
+select '{"tags":[{"term":["NYC", "CYN"]}, {"term":["1NYC", "1CYN"]} ]}'::jsonb ~~ 'tags.#.term. ? ( # = "NYC")';
+     ?column?     
+------------------
+ [["NYC", "CYN"]]
+(1 row)
+
 --ALL
 select 'a.*: = 4'::jsquery;
   jsquery   

Diff for: jsquery_io.c

@@ -378,6 +378,8 @@ printJsQueryItem(StringInfo buf, JsQueryItem *v, bool inKey, bool printBracketes
 			appendStringInfo(buf, "#%u", v->arrayIndex);
 			break;
 		case jqiFilter:
+			if (inKey)
+				appendStringInfoChar(buf, '.');
 			appendBinaryStringInfo(buf, " ?(", 3);
 			jsqGetArg(v, &elem);
 			printJsQueryItem(buf, &elem, false, false);

Diff for: sql/jsquery.sql

@@ -325,6 +325,8 @@ select '[1,2,3]'::jsonb ~~ ' ?(#:.$ > 2).$';
 select '[1,2,3]'::jsonb ~~ ' ?(#:.$ > 0).$';
 select '{"a": {"b": {"c": 1}}}'::jsonb ~~ '*.?(c >0)';
 select '{"a": {"b": {"c": 1}}}'::jsonb ~~ '?(*.c >0)';
+select '{"tags":[{"term":["NYC", "CYN"]}, {"term":["1NYC", "1CYN"]} ]}'::jsonb ~~ 'tags.#.term.#. ? ( $ = "NYC")';
+select '{"tags":[{"term":["NYC", "CYN"]}, {"term":["1NYC", "1CYN"]} ]}'::jsonb ~~ 'tags.#.term. ? ( # = "NYC")';
 
 --ALL
 select 'a.*: = 4'::jsquery;