Merge pull request #13701 from JavaScriptBach/backport-bulkwrite

Backport empty bulkwrite fix #13684 to Mongoose v6
Automattic · Aug 6, 2023 · d4a1080 · d4a1080
2 parents be5b7d5 + 6f5adfb
commit d4a1080
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -3772,17 +3772,21 @@ Model.bulkWrite = function(ops, options, callback) {
     let remaining = validations.length;
     let validOps = [];
     let validationErrors = [];
-    for (let i = 0; i < validations.length; ++i) {
-      validations[i]((err) => {
-        if (err == null) {
-          validOps.push(i);
-        } else {
-          validationErrors.push({ index: i, error: err });
-        }
-        if (--remaining <= 0) {
-          completeUnorderedValidation.call(this);
-        }
-      });
+    if (remaining === 0) {
+      completeUnorderedValidation.call(this);
+    } else {
+      for (let i = 0; i < validations.length; ++i) {
+        validations[i]((err) => {
+          if (err == null) {
+            validOps.push(i);
+          } else {
+            validationErrors.push({ index: i, error: err });
+          }
+          if (--remaining <= 0) {
+            completeUnorderedValidation.call(this);
+          }
+        });
+      }
     }
 
     validationErrors = validationErrors.

diff --git a/test/model.test.js b/test/model.test.js
@@ -7852,6 +7852,15 @@ describe('Model', function() {
 
   });
 
+  it('Model.bulkWrite(...) does not hang with empty array and ordered: false (gh-13664)', async function() {
+    const userSchema = new Schema({ name: String });
+    const User = db.model('User', userSchema);
+
+    const err = await User.bulkWrite([], { ordered: false }).then(() => null, err => err);
+    assert.ok(err);
+    assert.equal(err.name, 'MongoInvalidArgumentError');
+  });
+
   it('allows calling `create()` after `bulkWrite()` (gh-9350)', async function() {
     const schema = Schema({ foo: Boolean });
     const Model = db.model('Test', schema);