fix some merge conflicts with 6.x from #12791

Automattic · Mar 21, 2023 · 835017d · 835017d
1 parent 28260a7
commit 835017d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -2793,7 +2793,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
 
   // only validate required fields when necessary
   const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
-  let paths = shouldValidateModifiedOnly ?
+  const paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
   const skipSchemaValidators = pathDetails[1];
@@ -2993,7 +2993,7 @@ Document.prototype.validateSync = function(pathsToValidate, options) {
 
   // only validate required fields when necessary
   const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
-  let paths = shouldValidateModifiedOnly ?
+  const paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
   const skipSchemaValidators = pathDetails[1];

diff --git a/lib/model.js b/lib/model.js
@@ -3108,10 +3108,17 @@ Model.$__insertMany = function(arr, options, callback) {
 
         if (rawResult) {
           if (ordered === false) {
+            for (let i = 0; i < results.length; ++i) {
+              if (results[i] === void 0) {
+                results[i] = docs[i];
+              }
+            }
+
             // Decorate with mongoose validation errors in case of unordered,
             // because then still do `insertMany()`
             res.mongoose = {
-              validationErrors: validationErrors
+              validationErrors: validationErrors,
+              results: results
             };
           }
           return callback(null, res);