Use nodes JsonFomat and JsonReturning in JSON_ARRAY(query)

Nikita Glukhov · Nikita Glukhov · commit 7548800f999a · 2020-07-29T15:47:17.000+03:00
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
@@ -2423,7 +2423,7 @@ _copyJsonArrayQueryCtor(const JsonArrayQueryCtor *from)
 
 	COPY_NODE_FIELD(query);
 	COPY_NODE_FIELD(output);
-	COPY_SCALAR_FIELD(format);
+	COPY_NODE_FIELD(format);
 	COPY_SCALAR_FIELD(absent_on_null);
 	COPY_LOCATION_FIELD(location);
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -14846,6 +14846,7 @@ json_array_constructor:
 				{
 					JsonArrayQueryCtor *n = makeNode(JsonArrayQueryCtor);
 					n->query = $3;
+					n->format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 					/* n->format = $4; */
 					n->absent_on_null = true /* $5 */;
 					n->output = (JsonOutput *) $4;
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -4299,7 +4299,7 @@ transformJsonArrayCtor(ParseState *pstate, JsonArrayCtor *ctor)
 	jsctor = makeNode(JsonCtorExpr);
 	jsctor->args = args;
 	jsctor->type = JSCTOR_JSON_ARRAY;
-	jsctor->returning = transformJsonOutput(pstate, ctor->output, true);
+	jsctor->returning = transformJsonCtorOutput(pstate, ctor->output, args);
 	jsctor->unique = false;
 	jsctor->absent_on_null = ctor->absent_on_null;
 	jsctor->location = ctor->location;
diff --git a/src/test/regress/expected/sqljson.out b/src/test/regress/expected/sqljson.out
@@ -364,9 +364,9 @@ LINE 1: SELECT JSON_ARRAY(RETURNING bytea FORMAT JSON ENCODING UTF32...
                                           ^
 HINT:  only UTF8 JSON encoding is supported
 SELECT JSON_ARRAY('aaa', 111, true, array[1,2,3], NULL, json '{"a": [1]}', jsonb '["a",3]');
-                    json_array                     
----------------------------------------------------
- ["aaa", 111, true, [1,2,3], {"a": [1]}, ["a", 3]]
+                     json_array                      
+-----------------------------------------------------
+ ["aaa", 111, true, [1, 2, 3], {"a": [1]}, ["a", 3]]
 (1 row)
 
 SELECT JSON_ARRAY('a',  NULL, 'b' NULL   ON NULL);

Original file line number	Diff line number	Diff line change
`@@ -14846,6 +14846,7 @@ json_array_constructor:`
`14846`	`14846`	`{`
`14847`	`14847`	`JsonArrayQueryCtor *n = makeNode(JsonArrayQueryCtor);`
`14848`	`14848`	`n->query = $3;`
	`14849`	`+ n->format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);`
`14849`	`14850`	`/* n->format = $4; */`
`14850`	`14851`	`n->absent_on_null = true /* $5 */;`
`14851`	`14852`	`n->output = (JsonOutput *) $4;`