populate; allow setting single populated paths to docs

relates to #570
Automattic · Feb 3, 2013 · 5b79f81 · 5b79f81
1 parent 63db499
commit 5b79f81
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/lib/schema/buffer.js b/lib/schema/buffer.js
@@ -47,7 +47,10 @@ SchemaBuffer.prototype.checkRequired = function (value) {
  */
 
 SchemaBuffer.prototype.cast = function (value, doc, init) {
-  if (SchemaType._isRef(this, value, init)) return value;
+  var populated = init || doc && doc.populated && !! doc.populated(this.path);
+  if (SchemaType._isRef(this, value, populated)) {
+    return value;
+  }
 
   // documents with Buffer _ids
   if (value && Buffer.isBuffer(value._id)) {

diff --git a/lib/schema/number.js b/lib/schema/number.js
@@ -110,7 +110,10 @@ SchemaNumber.prototype.max = function (value, message) {
  */
 
 SchemaNumber.prototype.cast = function (value, doc, init) {
-  if (SchemaType._isRef(this, value, init)) return value;
+  var populated = init || doc && doc.populated && !! doc.populated(this.path);
+  if (SchemaType._isRef(this, value, populated)) {
+    return value;
+  }
 
   var val = value && value._id
     ? value._id // documents

diff --git a/lib/schema/objectid.js b/lib/schema/objectid.js
@@ -45,13 +45,16 @@ ObjectId.prototype.checkRequired = function checkRequired (value) {
  * Casts to ObjectId
  *
  * @param {Object} value
- * @param {Object} scope
+ * @param {Object} doc
  * @param {Boolean} init whether this is an initialization cast
  * @api private
  */
 
-ObjectId.prototype.cast = function (value, scope, init) {
-  if (SchemaType._isRef(this, value, init)) return value;
+ObjectId.prototype.cast = function (value, doc, init) {
+  var populated = init || doc && doc.populated && !! doc.populated(this.path);
+  if (SchemaType._isRef(this, value, populated)) {
+    return value;
+  }
 
   if (value === null) return value;
 

diff --git a/lib/schema/string.js b/lib/schema/string.js
@@ -191,8 +191,9 @@ SchemaString.prototype.checkRequired = function checkRequired (value) {
  * @api private
  */
 
-SchemaString.prototype.cast = function (value, scope, init) {
-  if (SchemaType._isRef(this, value, init)) {
+SchemaString.prototype.cast = function (value, doc, init) {
+  var populated = init || doc && doc.populated && !! doc.populated(this.path);
+  if (SchemaType._isRef(this, value, populated)) {
     return value;
   }
 

diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -2128,6 +2128,15 @@ describe('model: populate:', function(){
               assert.equal(doc.fans[7], _id);
             }
 
+            assert.equal(doc._creator.email, u1.email);
+
+            doc._creator = null;
+            assert.equal(null, doc._creator);
+
+            var creator = user('creator');
+            doc._creator = creator;
+            assert.equal(doc._creator, creator);
+
             doc.save(function (err) {
               assert.ifError(err);
               B.findById(b1).exec(function (err, doc) {