Merge pull request #12266 from Automattic/vkarpov15/fix-discriminator…

…-subpopulate-string fix(populate): handle specifying recursive populate as a string with discriminators
Automattic · Aug 23, 2022 · 8e49fa6 · 8e49fa6
2 parents 2de1a86 + bf2fe7c
commit 8e49fa6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -4704,7 +4704,7 @@ function populate(model, docs, options, callback) {
  */
 
 function _execPopulateQuery(mod, match, select, assignmentOpts, callback) {
-  const subPopulate = utils.clone(mod.options.populate);
+  let subPopulate = utils.clone(mod.options.populate);
   const queryOptions = Object.assign({
     skip: mod.options.skip,
     limit: mod.options.limit,
@@ -4749,6 +4749,8 @@ function _execPopulateQuery(mod, match, select, assignmentOpts, callback) {
     if (mod.model.baseModelName != null) {
       if (Array.isArray(subPopulate)) {
         subPopulate.forEach(pop => { pop.strictPopulate = false; });
+      } else if (typeof subPopulate === 'string') {
+        subPopulate = { path: subPopulate, strictPopulate: false };
       } else {
         subPopulate.strictPopulate = false;
       }

diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -6467,7 +6467,7 @@ describe('model: populate:', function() {
             return Log.find({}).
               populate({
                 path: 'activity',
-                populate: { path: 'postedBy' }
+                populate: 'postedBy'
               }).
               sort({ seq: -1 });
           }).