yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix emqx_json:to_ejson

This commit is contained in:
JianBo He 2020-02-21 13:15:41 +08:00
parent 3f6f0eca40
commit 9b6a8ebe84
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqx_json.erl
View File

@ -103,7 +103,7 @@ safe_decode(Json, Opts) ->
, from_ejson/1 , from_ejson/1
]}). ]}).
to_ejson([[{_,_}]|_] = L) -> to_ejson([[{_,_}|_]|_] = L) ->
[to_ejson(E) || E <- L]; [to_ejson(E) || E <- L];
to_ejson([{_, _}|_] = L) -> to_ejson([{_, _}|_] = L) ->
lists:foldl( lists:foldl(

5
test/emqx_json_SUITE.erl
View File

@ -68,6 +68,11 @@ t_decode_encode(_) ->
[{<<"foo">>, <<"bar">>}] = decode(encode({[{<<"foo">>, <<"bar">>}]})), [{<<"foo">>, <<"bar">>}] = decode(encode({[{<<"foo">>, <<"bar">>}]})),
[{<<"foo">>, <<"bar">>}] = decode(encode([{<<"foo">>, <<"bar">>}])), [{<<"foo">>, <<"bar">>}] = decode(encode([{<<"foo">>, <<"bar">>}])),
[[{<<"foo">>, <<"bar">>}]] = decode(encode([[{<<"foo">>, <<"bar">>}]])), [[{<<"foo">>, <<"bar">>}]] = decode(encode([[{<<"foo">>, <<"bar">>}]])),
[[{<<"foo">>, <<"bar">>},
{<<"a">>, <<"b">>}],
[{<<"x">>, <<"y">>}]] = decode(encode([[{<<"foo">>, <<"bar">>},
{<<"a">>, <<"b">>}],
[{<<"x">>, <<"y">>}]])),
#{<<"foo">> := <<"bar">>} = decode(encode(#{<<"foo">> => <<"bar">>}), [return_maps]), #{<<"foo">> := <<"bar">>} = decode(encode(#{<<"foo">> => <<"bar">>}), [return_maps]),
JsonText = <<"{\"bool\":true,\"int\":10,\"foo\":\"bar\"}">>, JsonText = <<"{\"bool\":true,\"int\":10,\"foo\":\"bar\"}">>,
JsonMaps = #{<<"bool">> => true, JsonMaps = #{<<"bool">> => true,