fixed; lean population

should be lean() throughout all subdocs as well closes #1382
Automattic · Mar 12, 2013 · c5527ba · c5527ba
1 parent 129bc78
commit c5527ba
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -1630,7 +1630,7 @@ Query.prototype.execFind = function (callback) {
         : completeMany(model, docs, fields, self, null, promise);
     }
 
-    var pop = utils.object.vals(self.options.populate);
+    var pop = preparePopulationOptions(self, options);
     model.populate(docs, pop, function (err, docs) {
       if (err) return promise.error(err);
       return true === options.lean
@@ -1729,7 +1729,7 @@ Query.prototype.findOne = function (callback) {
         : completeOne(model, doc, fields, self, null, promise);
     }
 
-    var pop = utils.object.vals(self.options.populate);
+    var pop = preparePopulationOptions(self, options);
     model.populate(doc, pop, function (err, doc) {
       if (err) return promise.error(err);
       return true === options.lean
@@ -1741,6 +1741,34 @@ Query.prototype.findOne = function (callback) {
   return this;
 }
 
+/*!
+ * Prepare a set of path options for query population.
+ *
+ * @param {Query} query
+ * @param {Object} options
+ * @return {Array}
+ */
+
+function preparePopulationOptions (query, options) {
+  var pop = utils.object.vals(query.options.populate);
+
+  // lean options should trickle through all queries
+  if (options.lean) pop.forEach(makeLean);
+
+  return pop;
+}
+
+/*!
+ * Set each path query option to lean
+ *
+ * @param {Object} option
+ */
+
+function makeLean (option) {
+  option.options || (option.options = {});
+  option.options.lean = true;
+}
+
 /*!
  * hydrates a document
  *

diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -2002,6 +2002,7 @@ describe('model: populate:', function(){
             assert.ok(utils.isObject(post._creator));
             assert.equal(post._creator.name, 'Guillermo');
             assert.equal(post._creator.email, 'rauchg@gmail.com');
+            assert.equal('undefined', typeof post._creator.update);
             done();
           });
         });
@@ -2041,13 +2042,17 @@ describe('model: populate:', function(){
 
             assert.equal(blogposts[0].fans[0].name,'Fan 1');
             assert.equal(blogposts[0].fans[0].email,'fan1@learnboost.com');
+            assert.equal('undefined', typeof blogposts[0].fans[0].update);
             assert.equal(blogposts[0].fans[1].name,'Fan 2');
             assert.equal(blogposts[0].fans[1].email,'fan2@learnboost.com');
+            assert.equal('undefined', typeof blogposts[0].fans[1].update);
 
             assert.equal(blogposts[1].fans[0].name,'Fan 2');
             assert.equal(blogposts[1].fans[0].email,'fan2@learnboost.com');
+            assert.equal('undefined', typeof blogposts[1].fans[0].update);
             assert.equal(blogposts[1].fans[1].name,'Fan 1');
             assert.equal(blogposts[1].fans[1].email,'fan1@learnboost.com');
+            assert.equal('undefined', typeof blogposts[1].fans[1].update);
             done();
           });
         });