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-12324 Wrong result (phantom array value) on JSON_EXTRACT.

Browse Source 
Fixed the path comparison.
This commit is contained in:
Alexey Botchkov
2017-08-07 13:46:45 +04:00
parent 4ff6ebf76a
commit f701ac65e9
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,3 +642,9 @@ SELECT JSON_KEYS(f) FROM t1 ORDER BY 1;
JSON_KEYS(f) JSON_KEYS(f)
NULL NULL
DROP TABLE t1; DROP TABLE t1;
SELECT JSON_EXTRACT( '{"foo":"bar"}', '$[*].*' );
JSON_EXTRACT( '{"foo":"bar"}', '$[*].*' )
NULL
SELECT JSON_EXTRACT( '{"foo":"bar"}', '$[*]' );
JSON_EXTRACT( '{"foo":"bar"}', '$[*]' )
NULL

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

@ -296,3 +296,9 @@ INSERT INTO t1 VALUES (0);
SELECT JSON_KEYS(f) FROM t1 ORDER BY 1; SELECT JSON_KEYS(f) FROM t1 ORDER BY 1;
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-12324 Wrong result (phantom array value) on JSON_EXTRACT.
#
SELECT JSON_EXTRACT( '{"foo":"bar"}', '$[*].*' );
SELECT JSON_EXTRACT( '{"foo":"bar"}', '$[*]' );

2
strings/json_lib.c
View File

@ -1756,7 +1756,7 @@ int json_path_parts_compare(
goto step_fits; goto step_fits;
goto step_failed; goto step_failed;
} }
if (a->n_item == 0) if ((a->type & JSON_PATH_WILD) == 0 && a->n_item == 0)
goto step_fits_autowrap; goto step_fits_autowrap;
goto step_failed; goto step_failed;
} }