Fix for regression caused by #806

couchbase · Jan 26, 2017 · 88f648a · 88f648a
1 parent 754e836
commit 88f648a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -159,3 +159,5 @@ UnityDemo.sln
 tmp/
 sync_gateway
 staging
+AboutResources.txt
+AboutAssets.txt
diff --git a/src/StorageEngines/SQLiteCommon/storage.sqlite.common/src/SqliteCouchStore.cs b/src/StorageEngines/SQLiteCommon/storage.sqlite.common/src/SqliteCouchStore.cs
@@ -1057,25 +1057,26 @@ public RevisionInternal GetDocument(string docId, RevisionID revId, bool withBod
             if (revId != null) {
                 sb.Append(" FROM revs WHERE revs.doc_id=? AND revid=? LIMIT 1");
             } else {
-                sb.Append(" FROM revs WHERE revs.doc_id=? and current=1 ORDER BY revid DESC LIMIT 1");
+                sb.Append(" FROM revs WHERE revs.doc_id=? and current=1 ORDER BY deleted, revid DESC LIMIT 1");
             }
 
             var transactionStatus = TryQuery(c =>
             {
-                if(revId == null) {
-                    revId = c.GetString(0).AsRevID();
+                var revIDToUse = revId;
+                if(revIDToUse == null) {
+                    revIDToUse = c.GetString(0).AsRevID();
                 }
 
                 bool deleted = c.GetInt(1) != 0;
-                result = new RevisionInternal(docId, revId, deleted);
+                result = new RevisionInternal(docId, revIDToUse, deleted);
                 result.Sequence = c.GetLong(2);
                 if(withBody) {
                     result.SetJson(c.GetBlob(3));
                 } else {
                     result.Missing = c.GetInt(3) == 0;
                 }
                     
-                return false;
+                return revId == null && deleted;
             }, sb.ToString(), docNumericId, revId?.ToString());
 
             if (transactionStatus.IsError) {