diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2019-06-04 19:43:25 -0500 |
|---|---|---|
| committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2019-06-04 19:43:25 -0500 |
| commit | 6c5028b2f68d10149028520ed91b3434b4e44ec6 (patch) | |
| tree | 78815c2241abb93e3fdafee85d734315fe666373 | |
| parent | abd5d86b5c673dcf638405fc7fe10c29577eb96d (diff) | |
| download | couchdb-prototype/rfc-001-revision-metadata-model.tar.gz | |
Fix error re-throwingprototype/rfc-001-revision-metadata-model
| -rw-r--r-- | src/fabric/src/fabric2_db.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/fabric/src/fabric2_db.erl b/src/fabric/src/fabric2_db.erl index 18f358e70..02a18fa23 100644 --- a/src/fabric/src/fabric2_db.erl +++ b/src/fabric/src/fabric2_db.erl @@ -537,6 +537,8 @@ update_doc(Db, Doc, Options) -> {ok, NewRev}; {ok, [{{_Id, _Rev}, Error}]} -> throw(Error); + {error, [{{_Id, _Rev}, Error}]} -> + throw(Error); {error, [Error]} -> throw(Error); {ok, []} -> @@ -569,9 +571,13 @@ update_docs(Db, Docs, Options) -> {#doc{} = Doc, Error} -> #doc{ id = DocId, - revs = {RevPos, [Rev | _]} + revs = Revs } = Doc, - {{DocId, {RevPos, Rev}}, Error}; + RevId = case Revs of + {RevPos, [Rev | _]} -> {RevPos, Rev}; + {0, []} -> {0, <<>>} + end, + {{DocId, RevId}, Error}; Else -> Else end |