Use nodes JsonFomat and JsonReturning in JsonCtorExpr

Nikita Glukhov · Nikita Glukhov · commit 21e8d2aa6ff1 · 2020-07-29T15:47:15.000+03:00
diff --git a/src/backend/parser/gram.y b/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; }
diff --git a/src/include/nodes/parsenodes.h b/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;

Original file line number	Diff line number	Diff line change
`@@ -14696,15 +14696,15 @@ json_func_expr:`
`14696`	`14696`	`json_value_expr:`
`14697`	`14697`	`a_expr json_format_clause_opt`
`14698`	`14698`	`{`
`14699`		`- $$ = (Node ) makeJsonValueExpr((Expr ) $1, $2);`
	`14699`	`+ $$ = (Node ) makeJsonValueExpr((Expr ) $1, castNode(JsonFormat, $2));`
`14700`	`14700`	`}`
`14701`	`14701`	`;`
`14702`	`14702`
`14703`	`14703`	`json_format_clause_opt:`
`14704`	`14704`	`FORMAT json_representation`
`14705`	`14705`	`{`
`14706`	`14706`	`$$ = $2;`
`14707`		`- $$.location = @1;`
	`14707`	`+ castNode(JsonFormat, $$)->location = @1;`
`14708`	`14708`	`}`
`14709`	`14709`	`\| /* EMPTY */`
`14710`	`14710`	`{`
`@@ -14734,7 +14734,8 @@ json_output_clause_opt:`
`14734`	`14734`	`{`
`14735`	`14735`	`JsonOutput *n = makeNode(JsonOutput);`
`14736`	`14736`	`n->typeName = $2;`
`14737`		`- n->returning.format = $3;`
	`14737`	`+ n->returning = makeNode(JsonReturning);`
	`14738`	`+ n->returning->format = (JsonFormat *) $3;`
`14738`	`14739`	`$$ = (Node *) n;`
`14739`	`14740`	`}`
`14740`	`14741`	`\| /* EMPTY */ { $$ = NULL; }`