diff options
| author | Robert Newson <rnewson@apache.org> | 2020-02-17 09:25:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 09:25:02 +0000 |
| commit | 1aea1a31f217a01697a3b9cd4e227ebdd53059a5 (patch) | |
| tree | 1a0e6f3f1514c5739ecc24676995b88c32d25852 | |
| parent | 140e3fa6b3080d44449c9c52900e8086925f631b (diff) | |
| parent | ca178f0e7fe9683da51d0c3bc322fb2b99826311 (diff) | |
| download | couchdb-reset-corrupt-view-index-2.tar.gz | |
Merge branch 'master' into reset-corrupt-view-index-2reset-corrupt-view-index-2
| -rw-r--r-- | src/couch/src/couch_util.erl | 7 | ||||
| -rw-r--r-- | src/couch/test/eunit/couch_util_tests.erl | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl index a785e2e44..dffb68152 100644 --- a/src/couch/src/couch_util.erl +++ b/src/couch/src/couch_util.erl @@ -21,7 +21,7 @@ -export([get_nested_json_value/2, json_user_ctx/1]). -export([proplist_apply_field/2, json_apply_field/2]). -export([to_binary/1, to_integer/1, to_list/1, url_encode/1]). --export([json_encode/1, json_decode/1]). +-export([json_encode/1, json_decode/1, json_decode/2]). -export([verify/2,simple_call/2,shutdown_sync/1]). -export([get_value/2, get_value/3]). -export([reorder_results/2]). @@ -498,8 +498,11 @@ json_encode(V) -> jiffy:encode(V, [force_utf8]). json_decode(V) -> + json_decode(V, []). + +json_decode(V, Opts) -> try - jiffy:decode(V, [dedupe_keys]) + jiffy:decode(V, [dedupe_keys | Opts]) catch error:Error -> throw({invalid_json, Error}) diff --git a/src/couch/test/eunit/couch_util_tests.erl b/src/couch/test/eunit/couch_util_tests.erl index 3e145c4f6..012c961a4 100644 --- a/src/couch/test/eunit/couch_util_tests.erl +++ b/src/couch/test/eunit/couch_util_tests.erl @@ -168,3 +168,10 @@ to_hex_test_() -> ?_assertEqual("", couch_util:to_hex(<<>>)), ?_assertEqual("010203faff", couch_util:to_hex(<<1, 2, 3, 250, 255>>)) ]. + +json_decode_test_() -> + [ + ?_assertEqual({[]}, couch_util:json_decode(<<"{}">>)), + ?_assertEqual({[]}, couch_util:json_decode(<<"{}">>, [])), + ?_assertEqual(#{}, couch_util:json_decode(<<"{}">>, [return_maps])) + ]. |