refactor(populate): only call assign() after all model queries for a …

…path are called re: #3812
Automattic · Sep 6, 2019 · eb75b54 · eb75b54
1 parent 39566f1
commit eb75b54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -4195,8 +4195,8 @@ function populate(model, docs, options, callback) {
         return callback(err, null);
       }
       vals = vals.concat(valsFromDb);
-      _assign(model, vals, mod, assignmentOpts);
       if (--_remaining === 0) {
+        _assign(model, vals, mod, assignmentOpts);
         callback();
       }
     }]);

diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -7478,7 +7478,7 @@ describe('model: populate:', function() {
 
       const eventSchema = new Schema({
         message: String
-      },{ discriminatorKey: 'kind' });
+      }, { discriminatorKey: 'kind' });
 
       const batchSchema = new Schema({
         events: [eventSchema]