diff options
author | Robert Newson <rnewson@apache.org> | 2014-02-07 14:41:12 +0000 |
---|---|---|
committer | Robert Newson <rnewson@apache.org> | 2014-02-07 14:41:12 +0000 |
commit | 14a38b783f11d11fd63fcf89686431279ad91da5 (patch) | |
tree | 87bf16b15659ffdfe7e105bb760c8619f426b616 | |
parent | b3bb78e7b54f8755faef1b8fa7ac26ceb49a0395 (diff) | |
parent | 2bc0784030847cbbdd8998d3f135f91992768f6a (diff) | |
download | couchdb-14a38b783f11d11fd63fcf89686431279ad91da5.tar.gz |
Merge branch 'key-vs-keys'
-rw-r--r-- | src/couch_mrview/src/couch_mrview_util.erl | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/couch_mrview/src/couch_mrview_util.erl b/src/couch_mrview/src/couch_mrview_util.erl index c4272f836..95f7be434 100644 --- a/src/couch_mrview/src/couch_mrview_util.erl +++ b/src/couch_mrview/src/couch_mrview_util.erl @@ -359,11 +359,13 @@ validate_args(Args) -> _ -> mrverror(<<"`keys` must be an array of strings.">>) end, - case {Args#mrargs.keys, Args#mrargs.start_key} of - {undefined, _} -> ok; - {[], _} -> ok; - {[_|_], undefined} -> ok; - _ -> mrverror(<<"`start_key` is incompatible with `keys`">>) + case {Args#mrargs.keys, Args#mrargs.start_key, + Args#mrargs.end_key} of + {undefined, _, _} -> ok; + {[], _, _} -> ok; + {[_|_], undefined, undefined} -> ok; + _ -> mrverror(<<"`keys` is incompatible with `key`" + ", `start_key` and `end_key`">>) end, case Args#mrargs.start_key_docid of @@ -372,13 +374,6 @@ validate_args(Args) -> _ -> mrverror(<<"`start_key_docid` must be a string.">>) end, - case {Args#mrargs.keys, Args#mrargs.end_key} of - {undefined, _} -> ok; - {[], _} -> ok; - {[_|_], undefined} -> ok; - _ -> mrverror(<<"`end_key` is incompatible with `keys`">>) - end, - case Args#mrargs.end_key_docid of undefined -> ok; EKDocId0 when is_binary(EKDocId0) -> ok; |