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-13104 Json functions.

Browse Source 
An extra ',' added to the JSON_MERGE result making it invalid.
This commit is contained in:
Alexey Botchkov
2017-09-12 15:21:53 +04:00
parent 467acc2119
commit 0cd731864e
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,3 +683,6 @@ JSON_OBJECT("foo", "bar`bar")
SELECT JSON_SET('{}', '$.age', 87); SELECT JSON_SET('{}', '$.age', 87);
JSON_SET('{}', '$.age', 87) JSON_SET('{}', '$.age', 87)
{"age": 87} {"age": 87}
SELECT JSON_MERGE('[]', '{"c":"d"}');
JSON_MERGE('[]', '{"c":"d"}')
[{"c": "d"}]

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

@@ -333,3 +333,8 @@ SELECT JSON_OBJECT("foo", "bar`bar");
# #
SELECT JSON_SET('{}', '$.age', 87); SELECT JSON_SET('{}', '$.age', 87);
#
# MDEV-13104 Json functions.
#
SELECT JSON_MERGE('[]', '{"c":"d"}');

17
sql/item_jsonfunc.cc
View File

@@ -1971,14 +1971,25 @@ continue_j2:
else else
{ {
const uchar *end1, *beg1, *end2, *beg2; const uchar *end1, *beg1, *end2, *beg2;
int empty_array= 0;
beg1= je1->value_begin; beg1= je1->value_begin;
/* Merge as a single array. */ /* Merge as a single array. */
if (je1->value_type == JSON_VALUE_ARRAY) if (je1->value_type == JSON_VALUE_ARRAY)
{ {
if (json_skip_level(je1)) int cur_level= je1->stack_p;
empty_array= 1;
while (json_scan_next(je1) == 0)
{
if (je1->stack_p < cur_level)
break;
empty_array= 0;
}
if (je1->s.error)
return 1; return 1;
end1= je1->s.c_str - je1->sav_c_len; end1= je1->s.c_str - je1->sav_c_len;
} }
else else
@@ -1995,8 +2006,8 @@ continue_j2:
end1= je1->value_end; end1= je1->value_end;
} }
if (str->append((const char*) beg1, end1 - beg1), if (str->append((const char*) beg1, end1 - beg1) ||
str->append(", ", 2)) (!empty_array && str->append(", ", 2)))
return 3; return 3;
if (json_value_scalar(je2)) if (json_value_scalar(je2))