Commit 2fcff310 authored by Alexey Botchkov's avatar Alexey Botchkov

MDEV-21902 Nested JSON_ARRAYAGG in JSON_OBJECT should not get escaped.

parent 74198384
...@@ -1243,6 +1243,9 @@ drop view v; ...@@ -1243,6 +1243,9 @@ drop view v;
select json_arrayagg(a order by a asc) from (select 1 a union select 2 a) t; select json_arrayagg(a order by a asc) from (select 1 a union select 2 a) t;
json_arrayagg(a order by a asc) json_arrayagg(a order by a asc)
[1,2] [1,2]
select json_object('x', json_arrayagg(json_object('a', 1)));
json_object('x', json_arrayagg(json_object('a', 1)))
{"x": [{"a": 1}]}
# #
# End of 10.5 tests # End of 10.5 tests
# #
...@@ -761,6 +761,8 @@ drop view v; ...@@ -761,6 +761,8 @@ drop view v;
select json_arrayagg(a order by a asc) from (select 1 a union select 2 a) t; select json_arrayagg(a order by a asc) from (select 1 a union select 2 a) t;
select json_object('x', json_arrayagg(json_object('a', 1)));
--echo # --echo #
--echo # End of 10.5 tests --echo # End of 10.5 tests
--echo # --echo #
......
...@@ -5325,6 +5325,7 @@ class Item_ref :public Item_ident, ...@@ -5325,6 +5325,7 @@ class Item_ref :public Item_ident,
{ {
return ref ? (*ref)->get_typelib() : NULL; return ref ? (*ref)->get_typelib() : NULL;
} }
bool is_json_type() { return (*ref)->is_json_type(); }
bool walk(Item_processor processor, bool walk_subquery, void *arg) bool walk(Item_processor processor, bool walk_subquery, void *arg)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment