fix; defaults with just _id projected (Fix #3407)

Automattic · Oct 2, 2015 · cf8c8da · cf8c8da
1 parent d4d5717
commit cf8c8da
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -159,11 +159,15 @@ Document.prototype.$__buildDoc = function(obj, fields, skipId) {
     keys = Object.keys(fields);
     ki = keys.length;
 
-    while (ki--) {
-      if (keys[ki] !== '_id' &&
-        (!fields[keys[ki]] || typeof fields[keys[ki]] !== 'object')) {
-        exclude = !fields[keys[ki]];
-        break;
+    if (ki === 1 && keys[0] === '_id') {
+      exclude = !!fields[keys[ki]];
+    } else {
+      while (ki--) {
+        if (keys[ki] !== '_id' &&
+          (!fields[keys[ki]] || typeof fields[keys[ki]] !== 'object')) {
+          exclude = !fields[keys[ki]];
+          break;
+        }
       }
     }
   }

diff --git a/test/model.field.selection.test.js b/test/model.field.selection.test.js
@@ -141,6 +141,21 @@ describe('model field selection', function() {
     });
   });
 
+  it('works with just _id and findOneAndUpdate (gh-3407)', function(done){
+    var db = start();
+
+    var MyModel = db.model('gh3407', { test: { type: Number, default: 1 } });
+
+    MyModel.collection.insert({}, function(error) {
+      assert.ifError(error);
+      MyModel.findOne({}, { _id: 1 }, function(error, doc) {
+        assert.ifError(error);
+        assert.ok(!doc.test);
+        done();
+      });
+    });
+  });
+
   it('works with subset of fields excluding emebedded doc _id (gh-541)', function(done) {
     var db = start()
       , BlogPostB = db.model(modelName, collection);