Merge pull request #10050 from SoftwareSing/fix-bulkwrite-with-timest…

…amps-false fix: make bulkWrite can work with `timestamps: false`
Automattic · Mar 22, 2021 · 4b1aaac · 4b1aaac
2 parents 5ffbb8e + 3759f34
commit 4b1aaac
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/lib/helpers/model/castBulkWrite.js b/lib/helpers/model/castBulkWrite.js
@@ -20,7 +20,7 @@ module.exports = function castBulkWrite(originalModel, op, options) {
       const model = decideModelByObject(originalModel, op['insertOne']['document']);
 
       const doc = new model(op['insertOne']['document']);
-      if (model.schema.options.timestamps != null) {
+      if (model.schema.options.timestamps) {
         doc.initializeTimestamps();
       }
       if (options.session != null) {
@@ -147,7 +147,7 @@ module.exports = function castBulkWrite(originalModel, op, options) {
 
       // set `skipId`, otherwise we get "_id field cannot be changed"
       const doc = new model(op['replaceOne']['replacement'], strict, true);
-      if (model.schema.options.timestamps != null) {
+      if (model.schema.options.timestamps) {
         doc.initializeTimestamps();
       }
       if (options.session != null) {
@@ -221,4 +221,4 @@ function decideModelByObject(model, object) {
     model = getDiscriminatorByValue(model, object[discriminatorKey]) || model;
   }
   return model;
-}
+}
diff --git a/test/model.test.js b/test/model.test.js
@@ -5780,6 +5780,35 @@ describe('Model', function() {
           assert.equal(people[3].age, 30);
         });
       });
+
+      it('insertOne and replaceOne should not throw an error when set `timestamps: false` in schmea (gh-10048)', function() {
+        const schema = new Schema({ name: String }, { timestamps: false });
+        const Model = db.model('Test', schema);
+
+        return co(function*() {
+          yield Model.create({ name: 'test' });
+
+          yield Model.bulkWrite([
+            {
+              insertOne: {
+                document: { name: 'insertOne-test' }
+              }
+            },
+            {
+              replaceOne: {
+                filter: { name: 'test' },
+                replacement: { name: 'replaceOne-test' }
+              }
+            }
+          ]);
+
+          for (const name of ['insertOne-test', 'replaceOne-test']) {
+            const doc = yield Model.findOne({ name });
+            assert.strictEqual(doc.createdAt, undefined);
+            assert.strictEqual(doc.updatedAt, undefined);
+          }
+        });
+      });
     });
 
     it('insertMany with Decimal (gh-5190)', function(done) {