diff options
| author | Robert Newson <rnewson@apache.org> | 2018-10-11 17:13:46 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2018-10-11 19:09:55 +0100 |
| commit | d9843824ee16ef237b182abd30b5dbfa5d251bcd (patch) | |
| tree | 9d420096a5a98d1f3d03992f2231cc89354275df | |
| parent | 959945575293244f948e887d6b0c42449fcdccd6 (diff) | |
| download | couchdb-d9843824ee16ef237b182abd30b5dbfa5d251bcd.tar.gz | |
Pass user_ctx in _bulk_get
This fixes _bulk_get for _users db and probably others I don't know
| -rw-r--r-- | src/chttpd/src/chttpd_db.erl | 3 | ||||
| -rw-r--r-- | src/chttpd/test/chttpd_db_bulk_get_test.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index 9cde6d907..d0a5a5b74 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -482,8 +482,9 @@ db_req(#httpd{method='POST', path_parts=[_, <<"_bulk_get">>]}=Req, Db) -> throw({bad_request, <<"Missing JSON list of 'docs'.">>}); Docs -> #doc_query_args{ - options = Options + options = Options0 } = bulk_get_parse_doc_query(Req), + Options = [{user_ctx, Req#httpd.user_ctx} | Options0], {ok, Resp} = start_json_response(Req, 200), send_chunk(Resp, <<"{\"results\": [">>), diff --git a/src/chttpd/test/chttpd_db_bulk_get_test.erl b/src/chttpd/test/chttpd_db_bulk_get_test.erl index f8921311b..908d1f022 100644 --- a/src/chttpd/test/chttpd_db_bulk_get_test.erl +++ b/src/chttpd/test/chttpd_db_bulk_get_test.erl @@ -214,7 +214,8 @@ should_include_attachments_when_atts_since_specified(_) -> ?_assert(meck:called(fabric, open_revs, [nil, DocId, [{1, <<"revorev">>}], - [{atts_since, [{1, <<"abc">>}]}, attachments]])). + [{atts_since, [{1, <<"abc">>}]}, attachments, + {user_ctx, undefined}]])). %% helpers |