Allow jsonpath $ everywhere

Author: Nikita Glukhov

src/backend/utils/adt/jsonpath.c

@@ -25,7 +25,7 @@
  */
 static int
 flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
-						 bool forbiddenRoot, bool insideArraySubscript)
+						 bool allowCurrent, bool insideArraySubscript)
 {
 	/* position from begining of jsonpath data */
 	int32		pos = buf->len - JSONPATH_HDRSZ;
@@ -92,11 +92,11 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 				appendBinaryStringInfo(buf, (char*)&right /* fake value */, sizeof(right));
 
 				chld = flattenJsonPathParseItem(buf, item->value.args.left,
-												forbiddenRoot,
+												allowCurrent,
 												insideArraySubscript);
 				*(int32*)(buf->data + left) = chld;
 				chld = flattenJsonPathParseItem(buf, item->value.args.right,
-												forbiddenRoot,
+												allowCurrent,
 												insideArraySubscript);
 				*(int32*)(buf->data + right) = chld;
 			}
@@ -119,7 +119,7 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 				appendStringInfoChar(buf, '\0');
 
 				chld = flattenJsonPathParseItem(buf, item->value.like_regex.expr,
-												forbiddenRoot,
+												allowCurrent,
 												insideArraySubscript);
 				*(int32 *)(buf->data + offs) = chld;
 			}
@@ -147,24 +147,20 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 
 				chld = flattenJsonPathParseItem(buf, item->value.arg,
 												item->type == jpiFilter ||
-												forbiddenRoot,
+												allowCurrent,
 												insideArraySubscript);
 				*(int32*)(buf->data + arg) = chld;
 			}
 			break;
 		case jpiNull:
 			break;
 		case jpiRoot:
-			if (forbiddenRoot)
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("root is not allowed in expression")));
 			break;
 		case jpiAnyArray:
 		case jpiAnyKey:
 			break;
 		case jpiCurrent:
-			if (!forbiddenRoot)
+			if (!allowCurrent)
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("@ is not allowed in root expressions")));
@@ -232,7 +228,7 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 
 	if (item->next)
 	{
-		chld = flattenJsonPathParseItem(buf, item->next, forbiddenRoot,
+		chld = flattenJsonPathParseItem(buf, item->next, allowCurrent,
 										insideArraySubscript);
 		*(int32 *)(buf->data + next) = chld;
 	}

src/backend/utils/adt/jsonpath_exec.c

@@ -28,6 +28,7 @@ typedef struct JsonPathExecContext
 {
 	List	   *vars;
 	bool		lax;
+	JsonbValue *root;				/* for $ evaluation */
 	int			innermostArraySize;	/* for LAST array index evaluation */
 } JsonPathExecContext;
 
@@ -1231,6 +1232,9 @@ recursiveExecuteNoUnwrap(JsonPathExecContext *cxt, JsonPathItem *jsp,
 				res = jperMakeError(ERRCODE_JSON_MEMBER_NOT_FOUND);
 			}
 			break;
+		case jpiRoot:
+			jb = cxt->root;
+			/* fall through */
 		case jpiCurrent:
 			if (!jspGetNext(jsp, &elem))
 			{
@@ -1493,19 +1497,6 @@ recursiveExecuteNoUnwrap(JsonPathExecContext *cxt, JsonPathItem *jsp,
 		case jpiPlus:
 		case jpiMinus:
 			res = executeUnaryArithmExpr(cxt, jsp, jb, found);
-			break;
-		case jpiRoot:
-			if (jspGetNext(jsp, &elem))
-			{
-				res = recursiveExecute(cxt, &elem, jb, found);
-			}
-			else
-			{
-				res = jperOk;
-				if (found)
-					*found = lappend(*found, copyJsonbValue(jb));
-			}
-
 			break;
 		case jpiFilter:
 			jspGetArg(jsp, &elem);
@@ -2050,12 +2041,11 @@ executeJsonPath(JsonPath *path, List *vars, Jsonb *json, List **foundJson)
 	JsonPathItem	jsp;
 	JsonbValue		jbv;
 
-	JsonbInitBinary(&jbv, json);
-
 	jspInit(&jsp, path);
 
 	cxt.vars = vars;
 	cxt.lax = (path->header & JSONPATH_LAX) != 0;
+	cxt.root = JsonbInitBinary(&jbv, json);
 	cxt.innermostArraySize = -1;
 
 	if (!cxt.lax && !foundJson)

src/test/regress/expected/jsonb_jsonpath.out

@@ -657,6 +657,12 @@ select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.c ? (.a == .b)');
  t
 (1 row)
 
+select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.c ? ($.c.a == .b)');
+ _jsonpath_exists 
+------------------
+ t
+(1 row)
+
 select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.* ? (.a == .b)');
  _jsonpath_exists 
 ------------------
@@ -765,6 +771,12 @@ select _jsonpath_exists(jsonb '[1,2,3]', '$ ? (-@[*] < -3)');
  f
 (1 row)
 
+select _jsonpath_exists(jsonb '1', '$ ? ($ > 0)');
+ _jsonpath_exists 
+------------------
+ t
+(1 row)
+
 -- unwrapping of operator arguments in lax mode
 select _jsonpath_query(jsonb '{"a": [2]}', 'lax $.a * 3');
  _jsonpath_query 

src/test/regress/expected/jsonpath.out

@@ -177,6 +177,12 @@ select '$.a/+-1'::jsonpath;
  ($."a" / -1)
 (1 row)
 
+select '$.g ? ($.a == 1)'::jsonpath;
+      jsonpath      
+--------------------
+ $."g"?($."a" == 1)
+(1 row)
+
 select '$.g ? (@ == 1)'::jsonpath;
     jsonpath    
 ----------------
@@ -315,6 +321,12 @@ select '$.a[$a + 1, ($b[*]) to -(@[0] * 2)]'::jsonpath;
  $."a"[$"a" + 1,$"b"[*] to -(@[0] * 2)]
 (1 row)
 
+select '$.a[$.a.size() - 3]'::jsonpath;
+        jsonpath         
+-------------------------
+ $."a"[$."a".size() - 3]
+(1 row)
+
 select 'last'::jsonpath;
 ERROR:  LAST is allowed only in array subscripts
 LINE 1: select 'last'::jsonpath;

src/test/regress/sql/jsonb_jsonpath.sql

@@ -134,6 +134,7 @@ from
 select _jsonpath_exists(jsonb '{"a": 1, "b":1}', '$ ? (.a == .b)');
 select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$ ? (.a == .b)');
 select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.c ? (.a == .b)');
+select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.c ? ($.c.a == .b)');
 select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.* ? (.a == .b)');
 select _jsonpath_exists(jsonb '{"a": 1, "b":1}', '$.** ? (.a == .b)');
 select _jsonpath_exists(jsonb '{"c": {"a": 1, "b":1}}', '$.** ? (.a == .b)');
@@ -153,6 +154,7 @@ select _jsonpath_exists(jsonb '[1,2,3]', '$ ? (+@[*] > +2)');
 select _jsonpath_exists(jsonb '[1,2,3]', '$ ? (+@[*] > +3)');
 select _jsonpath_exists(jsonb '[1,2,3]', '$ ? (-@[*] < -2)');
 select _jsonpath_exists(jsonb '[1,2,3]', '$ ? (-@[*] < -3)');
+select _jsonpath_exists(jsonb '1', '$ ? ($ > 0)');
 
 -- unwrapping of operator arguments in lax mode
 select _jsonpath_query(jsonb '{"a": [2]}', 'lax $.a * 3');

src/test/regress/sql/jsonpath.sql

@@ -31,6 +31,7 @@ select '$-1'::jsonpath;
 select '$--+1'::jsonpath;
 select '$.a/+-1'::jsonpath;
 
+select '$.g ? ($.a == 1)'::jsonpath;
 select '$.g ? (@ == 1)'::jsonpath;
 select '$.g ? (a == 1)'::jsonpath;
 select '$.g ? (.a == 1)'::jsonpath;
@@ -55,6 +56,7 @@ select '$.g ? (zip == $zip)'::jsonpath;
 select '$.a.[1,2, 3 to 16]'::jsonpath;
 select '$.a[1,2, 3 to 16]'::jsonpath;
 select '$.a[$a + 1, ($b[*]) to -(@[0] * 2)]'::jsonpath;
+select '$.a[$.a.size() - 3]'::jsonpath;
 select 'last'::jsonpath;
 select '"last"'::jsonpath;
 select '$.last'::jsonpath;