fixed; default array construction edge case

closes #1108
Automattic · Sep 19, 2012 · 3bd5119 · 3bd5119
1 parent dbda275
commit 3bd5119
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -157,16 +157,18 @@ function scopePaths (array, fields, init) {
     , keys = Object.keys(fields)
     , i = keys.length
     , selected = {}
+    , hasKeys
     , key
 
   while (i--) {
     key = keys[i];
     if (0 === key.indexOf(path)) {
+      hasKeys || (hasKeys = true);
       selected[key.substring(path.length)] = fields[key];
     }
   }
 
-  return selected;
+  return hasKeys && selected || undefined;
 }
 
 /**

diff --git a/test/model.field.selection.test.js b/test/model.field.selection.test.js
@@ -289,4 +289,23 @@ describe('model field selection', function(){
       })
     })
   })
+
+  it('selecting an array of docs applies defaults properly (gh-1108)', function(done){
+    var db = start()
+      , M = db.model(modelName, collection)
+
+    var m = new M({ title: '1108', comments: [{body:'yay'}] });
+    m.comments[0].comments = undefined;
+    m.save(function (err, doc) {
+      assert.ifError(err);
+      M.findById(doc._id).select('comments').exec(function (err, found) {
+        db.close();
+        assert.ifError(err);
+        assert.ok(Array.isArray(found.comments));
+        assert.equal(1, found.comments.length);
+        assert.ok(Array.isArray(found.comments[0].comments));
+        done();
+      })
+    });
+  })
 })