database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Alexey Botchkov
2020-06-04 14:21:04 +04:00
parent 74198384e1
commit 2fcff310d0
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/func_json.result
View File

@ -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
# #

2
mysql-test/main/func_json.test
View File

@ -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 #

1
sql/item.h
View File

@ -5325,6 +5325,7 @@ public:
{ {
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)
{ {