Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
2fcff310
Commit
2fcff310
authored
Jun 04, 2020
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-21902 Nested JSON_ARRAYAGG in JSON_OBJECT should not get escaped.
parent
74198384
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
mysql-test/main/func_json.result
mysql-test/main/func_json.result
+3
-0
mysql-test/main/func_json.test
mysql-test/main/func_json.test
+2
-0
sql/item.h
sql/item.h
+1
-0
No files found.
mysql-test/main/func_json.result
View file @
2fcff310
...
...
@@ -1243,6 +1243,9 @@ drop view v;
select json_arrayagg(a order by a asc) from (select 1 a union select 2 a) t;
json_arrayagg(a order by a asc)
[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
#
mysql-test/main/func_json.test
View file @
2fcff310
...
...
@@ -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_object
(
'x'
,
json_arrayagg
(
json_object
(
'a'
,
1
)));
--
echo
#
--
echo
# End of 10.5 tests
--
echo
#
...
...
sql/item.h
View file @
2fcff310
...
...
@@ -5325,6 +5325,7 @@ class Item_ref :public Item_ident,
{
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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment