Add JsonValueExpr transformation

Author: Nikita Glukhov

src/backend/parser/parse_expr.c

@@ -132,6 +132,7 @@ static Node *transformJsonObjectAgg(ParseState *pstate, JsonObjectAgg *agg);
 static Node *transformJsonArrayAgg(ParseState *pstate, JsonArrayAgg *agg);
 static Node *transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *p);
 static Node *transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *p);
+static Node *transformJsonValueExpr(ParseState *pstate, JsonValueExpr *jve);
 static Node *make_row_comparison_op(ParseState *pstate, List *opname,
 					   List *largs, List *rargs, int location);
 static Node *make_row_distinct_op(ParseState *pstate, List *opname,
@@ -408,6 +409,10 @@ transformExprRecurse(ParseState *pstate, Node *expr)
 			result = transformJsonFuncExpr(pstate, (JsonFuncExpr *) expr);
 			break;
 
+		case T_JsonValueExpr:
+			result = transformJsonValueExpr(pstate, (JsonValueExpr *) expr);
+			break;
+
 		default:
 			/* should not reach here */
 			elog(ERROR, "unrecognized node type: %d", (int) nodeTag(expr));
@@ -3573,8 +3578,8 @@ makeCaseTestExpr(Node *expr)
 }
 
 static Node *
-transformJsonValueExpr(ParseState *pstate, JsonValueExpr *ve,
-					   JsonFormatType format, Node **rawexpr)
+transformJsonValueExprExt(ParseState *pstate, JsonValueExpr *ve,
+						  JsonFormatType format, Node **rawexpr)
 {
 	Node	   *expr = transformExprRecurse(pstate, (Node *) ve->expr);
 	Oid			exprtype;
@@ -3672,6 +3677,18 @@ transformJsonValueExpr(ParseState *pstate, JsonValueExpr *ve,
 	return expr;
 }
 
+static Node *
+transformJsonValueExpr(ParseState *pstate, JsonValueExpr *jve)
+{
+	return transformJsonValueExprExt(pstate, jve, JS_FORMAT_JSON, NULL);
+}
+
+static Node *
+transformJsonValueExprDefault(ParseState *pstate, JsonValueExpr *jve)
+{
+	return transformJsonValueExprExt(pstate, jve, JS_FORMAT_DEFAULT, NULL);
+}
+
 static void
 checkJsonOutputFormat(ParseState *pstate, JsonFormat *format, Oid targettype,
 					  bool allow_format)
@@ -3826,8 +3843,7 @@ transformJsonObjectCtor(ParseState *pstate, JsonObjectCtor *ctor)
 		{
 			JsonKeyValue *kv = castNode(JsonKeyValue, lfirst(lc));
 			Node	   *key = transformExprRecurse(pstate, (Node *) kv->key);
-			Node	   *val = transformJsonValueExpr(pstate, kv->value,
-													 JS_FORMAT_DEFAULT, NULL);
+			Node	   *val = transformJsonValueExprDefault(pstate, kv->value);
 
 			args = lappend(args, key);
 			args = lappend(args, val);
@@ -4001,8 +4017,7 @@ transformJsonObjectAgg(ParseState *pstate, JsonObjectAgg *agg)
 	transformJsonOutput(pstate, &agg->ctor.output, true);
 
 	key = transformExprRecurse(pstate, (Node *) agg->arg->key);
-	val = transformJsonValueExpr(pstate, agg->arg->value,
-								 JS_FORMAT_DEFAULT, NULL);
+	val = transformJsonValueExprDefault(pstate, agg->arg->value);
 	args = list_make4(key,
 					  val,
 					  makeBoolConst(agg->absent_on_null, false),
@@ -4031,7 +4046,7 @@ transformJsonArrayAgg(ParseState *pstate, JsonArrayAgg *agg)
 
 	transformJsonOutput(pstate, &agg->ctor.output, true);
 
-	arg = transformJsonValueExpr(pstate, agg->arg, JS_FORMAT_DEFAULT, NULL);
+	arg = transformJsonValueExprDefault(pstate, agg->arg);
 
 	if (agg->ctor.output->returning.format.type == JS_FORMAT_JSONB)
 	{
@@ -4065,8 +4080,7 @@ transformJsonArrayCtor(ParseState *pstate, JsonArrayCtor *ctor)
 		foreach(lc, ctor->exprs)
 		{
 			JsonValueExpr *jsval = castNode(JsonValueExpr, lfirst(lc));
-			Node	   *val = transformJsonValueExpr(pstate, jsval,
-													 JS_FORMAT_DEFAULT, NULL);
+			Node	   *val = transformJsonValueExprDefault(pstate, jsval);
 
 			args = lappend(args, val);
 		}
@@ -4200,10 +4214,9 @@ transformJsonPassingArgs(ParseState *pstate, List *args, JsonPassing *passing)
 	foreach(lc, args)
 	{
 		JsonArgument *arg = castNode(JsonArgument, lfirst(lc));
-		Node	   *expr;
-
-		expr = transformJsonValueExpr(pstate, arg->val,
-									  JS_FORMAT_JSONB_ARG, NULL);
+		Node	   *expr = transformJsonValueExprExt(pstate, arg->val,
+													 JS_FORMAT_JSONB_ARG,
+													 NULL);
 
 		passing->values = lappend(passing->values, expr);
 		passing->names = lappend(passing->names, makeString(arg->name));
@@ -4237,9 +4250,10 @@ transformJsonExprCommon(ParseState *pstate, JsonFuncExpr *func)
 
 	jsexpr->location = func->location;
 	jsexpr->op = func->op;
-	jsexpr->formatted_expr = transformJsonValueExpr(pstate, func->common->expr,
-													JS_FORMAT_JSON,
-													&jsexpr->raw_expr);
+	jsexpr->formatted_expr = transformJsonValueExprExt(pstate,
+													   func->common->expr,
+													   JS_FORMAT_JSON,
+													   &jsexpr->raw_expr);
 	if (jsexpr->formatted_expr == jsexpr->raw_expr)
 		jsexpr->formatted_expr = NULL;