Commit21e8d2a

Nikita Glukhov

committed

Use nodes JsonFomat and JsonReturning in JsonCtorExpr

1 parentcb80df9 commit21e8d2aCopy full SHA for 21e8d2a

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

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; }`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1496,7 +1496,7 @@ typedef struct JsonOutput`
`1496`	`1496`	`{`
`1497`	`1497`	`NodeTagtype;`
`1498`	`1498`	`TypeNametypeName;/ RETURNING type name, if specified */`
`1499`		`-JsonReturningreturning;/* RETURNING FORMAT clause and type Oids */`
	`1499`	`+JsonReturningreturning;/ RETURNING FORMAT clause and type Oids */`
`1500`	`1500`	`}JsonOutput;`
`1501`	`1501`
`1502`	`1502`	`/*`
`@@ -1547,7 +1547,7 @@ typedef struct JsonArrayQueryCtor`
`1547`	`1547`	`NodeTagtype;`
`1548`	`1548`	`Nodequery;/ subquery */`
`1549`	`1549`	`JsonOutputoutput;/ RETURNING clause, if specified */`
`1550`		`-JsonFormatformat;/* FORMAT clause for subquery, if specified */`
	`1550`	`+JsonFormatformat;/ FORMAT clause for subquery, if specified */`
`1551`	`1551`	`boolabsent_on_null;/* skip NULL elements? */`
`1552`	`1552`	`intlocation;/* token location, or -1 if unknown */`
`1553`	`1553`	`}JsonArrayQueryCtor;`

Comments

(0)