You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/07/12 14:27:57 UTC
[1/2] couch commit: updated refs/heads/master to bcb7c1a
Repository: couchdb-couch
Updated Branches:
refs/heads/master e858e7dfe -> bcb7c1a36
better error text for check_docids
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/bcb7c1a3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/bcb7c1a3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/bcb7c1a3
Branch: refs/heads/master
Commit: bcb7c1a36ebece3c3b6f47d2a96e700e09fee292
Parents: dec1c99
Author: Robert Newson <rn...@apache.org>
Authored: Sun Jul 12 13:27:12 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Jul 12 13:27:39 2015 +0100
----------------------------------------------------------------------
src/couch_changes.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/bcb7c1a3/src/couch_changes.erl
----------------------------------------------------------------------
diff --git a/src/couch_changes.erl b/src/couch_changes.erl
index 2b2647f..9a1d406 100644
--- a/src/couch_changes.erl
+++ b/src/couch_changes.erl
@@ -322,13 +322,13 @@ get_doc_ids(_) ->
check_docids(DocIds) when is_list(DocIds) ->
lists:foreach(fun
(DocId) when not is_binary(DocId) ->
- Msg = "`doc_ids` filter parameter is not a list of binaries.",
+ Msg = "`doc_ids` filter parameter is not a list of doc ids.",
throw({bad_request, Msg});
(_) -> ok
end, DocIds),
DocIds;
check_docids(_) ->
- Msg = "`doc_ids` filter parameter is not a list of binaries.",
+ Msg = "`doc_ids` filter parameter is not a list of doc ids.",
throw({bad_request, Msg}).
[2/2] couch commit: updated refs/heads/master to bcb7c1a
Posted by rn...@apache.org.
Revert "Throw bad request for empty POST request body when filtering by doc_ids"
This reverts commit e858e7dfef06a4d6e6c9228de80628f7166397ef.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/dec1c99f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/dec1c99f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/dec1c99f
Branch: refs/heads/master
Commit: dec1c99f0d96bd39eccf78ee1c7f489a240673ef
Parents: e858e7d
Author: Robert Newson <rn...@apache.org>
Authored: Sun Jul 12 13:27:26 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Jul 12 13:27:39 2015 +0100
----------------------------------------------------------------------
src/couch_changes.erl | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/dec1c99f/src/couch_changes.erl
----------------------------------------------------------------------
diff --git a/src/couch_changes.erl b/src/couch_changes.erl
index 33e7c14..2b2647f 100644
--- a/src/couch_changes.erl
+++ b/src/couch_changes.erl
@@ -309,10 +309,6 @@ get_view_qs(Req) ->
get_doc_ids({json_req, {Props}}) ->
check_docids(couch_util:get_value(<<"doc_ids">>, Props));
-get_doc_ids(#httpd{method='POST', req_body=undefined}) ->
- throw({bad_request,
- "`_doc_ids` filter requires JSON object body with field \"doc_ids\" "
- "containing array of ids."});
get_doc_ids(#httpd{method='POST'}=Req) ->
{Props} = couch_httpd:json_body_obj(Req),
check_docids(couch_util:get_value(<<"doc_ids">>, Props));