Use nodes JsonFomat and JsonReturning in JSON_ARRAY(query)

Author: Nikita Glukhov

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);
 

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;

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;

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);