Use nodes JsonFomat and JsonReturning in JsonCtorExpr

Author: Nikita Glukhov

src/backend/parser/gram.y

@@ -14696,15 +14696,15 @@ json_func_expr:
 json_value_expr:
 			a_expr json_format_clause_opt
 			{
-				$$ = (Node *) makeJsonValueExpr((Expr *) $1, $2);
+				$$ = (Node *) makeJsonValueExpr((Expr *) $1, castNode(JsonFormat, $2));
 			}
 		;
 
 json_format_clause_opt:
 			FORMAT json_representation
 				{
 					$$ = $2;
-					$$.location = @1;
+					castNode(JsonFormat, $$)->location = @1;
 				}
 			| /* EMPTY */
 				{
@@ -14734,7 +14734,8 @@ json_output_clause_opt:
 				{
 					JsonOutput *n = makeNode(JsonOutput);
 					n->typeName = $2;
-					n->returning.format = $3;
+					n->returning = makeNode(JsonReturning);
+					n->returning->format = (JsonFormat *) $3;
 					$$ = (Node *) n;
 				}
 			| /* EMPTY */							{ $$ = NULL; }

src/include/nodes/parsenodes.h

@@ -1496,7 +1496,7 @@ typedef struct JsonOutput
 {
 	NodeTag		type;
 	TypeName   *typeName;		/* RETURNING type name, if specified */
-	JsonReturning returning;	/* RETURNING FORMAT clause and type Oids */
+	JsonReturning *returning;	/* RETURNING FORMAT clause and type Oids */
 } JsonOutput;
 
 /*
@@ -1547,7 +1547,7 @@ typedef struct JsonArrayQueryCtor
 	NodeTag		type;
 	Node	   *query;			/* subquery */
 	JsonOutput *output;			/* RETURNING clause, if specified  */
-	JsonFormat	format;			/* FORMAT clause for subquery, if specified */
+	JsonFormat *format;			/* FORMAT clause for subquery, if specified */
 	bool		absent_on_null;	/* skip NULL elements? */
 	int			location;		/* token location, or -1 if unknown */
 } JsonArrayQueryCtor;