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-13633 JSON_ARRAY() - bad output with some UTF8 characters.

Browse Source 
set_charset() calls added for Item_func_json_arran
        and Item_func_json_object::val_str-s.
This commit is contained in:
Alexey Botchkov
2017-09-13 15:17:28 +04:00
parent a237a92099
commit dc82f70e9f
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,3 +699,9 @@ select @str, @path, JSON_EXTRACT(@str, @path);
select json_array(5,json_query('[1,2]','$')); select json_array(5,json_query('[1,2]','$'));
json_array(5,json_query('[1,2]','$')) json_array(5,json_query('[1,2]','$'))
[5, [1,2]] [5, [1,2]]
SELECT JSON_ARRAY('1. ě 2. š 3. č 4. ř 5. ž 6. ý 7. á 8. í 9. é 10. ů 11. ú') AS json_data;
json_data
["1. ě 2. š 3. č 4. ř 5. ž 6. ý 7. á 8. í 9. é 10. ů 11. ú"]
SELECT JSON_OBJECT("user","Jožko Mrkvičká") as json_data;
json_data
{"user": "Jožko Mrkvičká"}

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

@ -354,3 +354,9 @@ select @str, @path, JSON_EXTRACT(@str, @path);
# #
select json_array(5,json_query('[1,2]','$')); select json_array(5,json_query('[1,2]','$'));
#
# MDEV-13633 JSON_ARRAY() - bad output with some UTF8 characters.
#
SELECT JSON_ARRAY('1. ě 2. š 3. č 4. ř 5. ž 6. ý 7. á 8. í 9. é 10. ů 11. ú') AS json_data;
SELECT JSON_OBJECT("user","Jožko Mrkvičká") as json_data;

2
sql/item_jsonfunc.cc
View File

@ -1473,6 +1473,7 @@ String *Item_func_json_array::val_str(String *str)
uint n_arg; uint n_arg;
str->length(0); str->length(0);
str->set_charset(collation.collation);
if (str->append("[", 1) || if (str->append("[", 1) ||
((arg_count > 0) && append_json_value(str, args[0], &tmp_val))) ((arg_count > 0) && append_json_value(str, args[0], &tmp_val)))
@ -1797,6 +1798,7 @@ String *Item_func_json_object::val_str(String *str)
uint n_arg; uint n_arg;
str->length(0); str->length(0);
str->set_charset(collation.collation);
if (str->append("{", 1) || if (str->append("{", 1) ||
(arg_count > 0 && (arg_count > 0 &&