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

MDEV-17121 JSON_ARRAY_APPEND.

Browse Source 
Extra comma added to the result when an json array is empty.
This commit is contained in:
Alexey Botchkov
2018-09-11 14:37:45 +04:00
parent 4d9ec7cb6c
commit c8bb43a938
5 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
strings/json_lib.c
View File

@@ -1197,6 +1197,31 @@ int json_skip_to_level(json_engine_t *j, int level)
}
#define json_skip_level(json_engine) \
json_skip_to_level((json_engine), (json_engine)->stack_p)
/*
works as json_skip_level() but also counts items on the current
level skipped.
*/
int json_skip_level_and_count(json_engine_t *j, int *n_items_skipped)
{
int level= j->stack_p;
*n_items_skipped= 0;
while (json_scan_next(j) == 0)
{
if (j->stack_p < level)
return 0;
if (j->stack_p == level && j->state == JST_VALUE)
(*n_items_skipped)++;
}
return 1;
}
int json_skip_key(json_engine_t *j)
{
if (json_read_value(j))