fix(query): apply schema-level projections to the result of `findOneA…

…ndReplace()` Fix #7654
Automattic · May 27, 2019 · f94cc4e · f94cc4e
1 parent 85efe9b
commit f94cc4e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -3216,6 +3216,7 @@ Query.prototype._findOneAndReplace = wrapThunk(function(callback) {
 
   const castedDoc = new this.model(this._update, null, true);
 
+  this._applyPaths();
   if (this._fields != null) {
     options.projection = this._castFields(utils.clone(this._fields));
     fields = options.projection;

diff --git a/test/model.findOneAndReplace.test.js b/test/model.findOneAndReplace.test.js
@@ -408,4 +408,18 @@ describe('model: findOneAndReplace:', function() {
         err.errors['age'].message);
     });
   });
+
+  it('schema-level projection (gh-7654)', function() {
+    const schema = new Schema({ name: String, age: { type: Number, select: false } });
+    const Model = db.model('gh7654_0', schema);
+
+    return co(function*() {
+      const doc = yield Model.findOneAndReplace({}, { name: 'Jean-Luc Picard', age: 59 }, {
+        upsert: true,
+        returnOriginal: false
+      });
+
+      assert.ok(!doc.age);
+    });
+  });
 });