Fix jsonpath ternary logic

Author: Nikita Glukhov

src/backend/utils/adt/jsonpath_exec.c

@@ -459,19 +459,27 @@ recursiveExecute(JsonPathItem *jsp, List *vars, JsonbValue *jb, List **found)
 		case jpiAnd:
 			jspGetLeftArg(jsp, &elem);
 			res = recursiveExecute(&elem, vars, jb, NULL);
-			if (res == jperOk)
+			if (res != jperNotFound)
 			{
+				JsonPathExecResult res2;
+
 				jspGetRightArg(jsp, &elem);
-				res = recursiveExecute(&elem, vars, jb, NULL);
+				res2 = recursiveExecute(&elem, vars, jb, NULL);
+
+				res = res2 == jperOk ? res : res2;
 			}
 			break;
 		case jpiOr:
 			jspGetLeftArg(jsp, &elem);
 			res = recursiveExecute(&elem, vars, jb, NULL);
-			if (res == jperNotFound)
+			if (res != jperOk)
 			{
+				JsonPathExecResult res2;
+
 				jspGetRightArg(jsp, &elem);
-				res = recursiveExecute(&elem, vars, jb, NULL);
+				res2 = recursiveExecute(&elem, vars, jb, NULL);
+
+				res = res2 == jperNotFound ? res : res2;
 			}
 			break;
 		case jpiNot:
@@ -490,15 +498,8 @@ recursiveExecute(JsonPathItem *jsp, List *vars, JsonbValue *jb, List **found)
 			break;
 		case jpiIsUnknown:
 			jspGetArg(jsp, &elem);
-			switch ((res = recursiveExecute(&elem, vars, jb, NULL)))
-			{
-				case jperError:
-					res = jperOk;
-					break;
-				default:
-					res = jperNotFound;
-					break;
-			}
+			res = recursiveExecute(&elem, vars, jb, NULL);
+			res = res == jperError ? jperOk : jperNotFound;
 			break;
 		case jpiKey:
 			if (JsonbType(jb) == jbvObject)

src/test/regress/expected/jsonb_jsonpath.out

@@ -465,3 +465,54 @@ select _jsonpath_query(jsonb '{"g": {"x": 2}}', '$.g ? (exists (@.x ? (@ >= 2) )
  {"x": 2}
 (1 row)
 
+--test ternary logic
+select
+	x, y,
+	_jsonpath_query(
+		jsonb '[true, false, null]',
+		'$[*] ? (@ == true  &&  ($x == true && $y == true) ||
+				 @ == false && !($x == true && $y == true) ||
+				 @ == null  &&  ($x == true && $y == true) is unknown)',
+		jsonb_build_object('x', x, 'y', y)
+	) as "x && y"
+from
+	(values (jsonb 'true'), ('false'), ('"null"')) x(x),
+	(values (jsonb 'true'), ('false'), ('"null"')) y(y);
+   x    |   y    | x && y 
+--------+--------+--------
+ true   | true   | true
+ true   | false  | false
+ true   | "null" | null
+ false  | true   | false
+ false  | false  | false
+ false  | "null" | false
+ "null" | true   | null
+ "null" | false  | false
+ "null" | "null" | null
+(9 rows)
+
+select
+	x, y,
+	_jsonpath_query(
+		jsonb '[true, false, null]',
+		'$[*] ? (@ == true  &&  ($x == true || $y == true) ||
+				 @ == false && !($x == true || $y == true) ||
+				 @ == null  &&  ($x == true || $y == true) is unknown)',
+		jsonb_build_object('x', x, 'y', y)
+	) as "x || y"
+from
+	(values (jsonb 'true'), ('false'), ('"null"')) x(x),
+	(values (jsonb 'true'), ('false'), ('"null"')) y(y);
+   x    |   y    | x || y 
+--------+--------+--------
+ true   | true   | true
+ true   | false  | true
+ true   | "null" | true
+ false  | true   | true
+ false  | false  | false
+ false  | "null" | null
+ "null" | true   | true
+ "null" | false  | null
+ "null" | "null" | null
+(9 rows)
+

src/test/regress/sql/jsonb_jsonpath.sql

@@ -82,3 +82,30 @@ select * from _jsonpath_exists(jsonb '{"a": {"c": {"b": 1}}}', '$.**{2,3}.b ? (@
 select _jsonpath_query(jsonb '{"g": {"x": 2}}', '$.g ? (exists (@.x))');
 select _jsonpath_query(jsonb '{"g": {"x": 2}}', '$.g ? (exists (@.y))');
 select _jsonpath_query(jsonb '{"g": {"x": 2}}', '$.g ? (exists (@.x ? (@ >= 2) ))');
+
+--test ternary logic
+select
+	x, y,
+	_jsonpath_query(
+		jsonb '[true, false, null]',
+		'$[*] ? (@ == true  &&  ($x == true && $y == true) ||
+				 @ == false && !($x == true && $y == true) ||
+				 @ == null  &&  ($x == true && $y == true) is unknown)',
+		jsonb_build_object('x', x, 'y', y)
+	) as "x && y"
+from
+	(values (jsonb 'true'), ('false'), ('"null"')) x(x),
+	(values (jsonb 'true'), ('false'), ('"null"')) y(y);
+
+select
+	x, y,
+	_jsonpath_query(
+		jsonb '[true, false, null]',
+		'$[*] ? (@ == true  &&  ($x == true || $y == true) ||
+				 @ == false && !($x == true || $y == true) ||
+				 @ == null  &&  ($x == true || $y == true) is unknown)',
+		jsonb_build_object('x', x, 'y', y)
+	) as "x || y"
+from
+	(values (jsonb 'true'), ('false'), ('"null"')) x(x),
+	(values (jsonb 'true'), ('false'), ('"null"')) y(y);