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

MDEV-11468 JSON_UNQUOTE returns incorrect results.

Browse Source 
Now return the argument's value when error.
This commit is contained in:
Alexey Botchkov
2016-12-06 00:34:25 +04:00
parent 0009f4a441
commit 3743b4c3ef
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,6 +277,9 @@ drop table t1;
select json_unquote('"abc"'); select json_unquote('"abc"');
json_unquote('"abc"') json_unquote('"abc"')
abc abc
select json_unquote('abc');
json_unquote('abc')
abc
select json_object("a", json_object("b", "abcd")); select json_object("a", json_object("b", "abcd"));
json_object("a", json_object("b", "abcd")) json_object("a", json_object("b", "abcd"))
{"a": {"b": "abcd"}} {"a": {"b": "abcd"}}

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

@ -121,6 +121,7 @@ drop table t1;
select json_unquote('"abc"'); select json_unquote('"abc"');
select json_unquote('abc');
select json_object("a", json_object("b", "abcd")); select json_object("a", json_object("b", "abcd"));
select json_object("a", '{"b": "abcd"}'); select json_object("a", '{"b": "abcd"}');

4
sql/item_jsonfunc.cc
View File

@ -359,8 +359,8 @@ String *Item_func_json_unquote::val_str(String *str)
return str; return str;
error: error:
null_value= 1; /* We just return the argument's value in the case of error. */
return 0; return js;
} }