database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-11446 JSON_MERGE accepts arguments in invalid format.

Browse Source 
Test case added.
This commit is contained in:
Alexey Botchkov
2016-12-06 01:35:40 +04:00
parent 3bae5328ea
commit fba1eab92f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,6 +234,9 @@ json_merge('{"1": 2}', '{"true": false}', '{"3": 4}')
select json_merge(NULL,json_object('foo', 1)); select json_merge(NULL,json_object('foo', 1));
json_merge(NULL,json_object('foo', 1)) json_merge(NULL,json_object('foo', 1))
NULL NULL
select json_merge('a','b');
json_merge('a','b')
NULL
select json_type('{"k1":123, "k2":345}'); select json_type('{"k1":123, "k2":345}');
json_type('{"k1":123, "k2":345}') json_type('{"k1":123, "k2":345}')
OBJECT OBJECT

1
mysql-test/t/func_json.test
View File

@@ -98,6 +98,7 @@ select json_merge('[1, 2]', '[true, false]');
select json_merge('{"1": 2}', '{"true": false}'); select json_merge('{"1": 2}', '{"true": false}');
select json_merge('{"1": 2}', '{"true": false}', '{"3": 4}'); select json_merge('{"1": 2}', '{"true": false}', '{"3": 4}');
select json_merge(NULL,json_object('foo', 1)); select json_merge(NULL,json_object('foo', 1));
select json_merge('a','b');
select json_type('{"k1":123, "k2":345}'); select json_type('{"k1":123, "k2":345}');
select json_type('[123, "k2", 345]'); select json_type('[123, "k2", 345]');