Don't mutate attributes with format, mentioned in knex#315

elliotf · Jun 12, 2014 · 9258bbf · 9258bbf
1 parent fad7add
commit 9258bbf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -136,7 +136,7 @@ _.extend(BookshelfModel.prototype, {
   load: Promise.method(function(relations, options) {
     return Promise.bind(this)
       .then(function() {
-        return [this.format(this.attributes)];
+        return [this.format(_.extend(Object.create(null), this.attributes))];
       })
       .then(function(response) {
         return this._handleEager(response, _.extend({}, options, {

diff --git a/lib/relation.js b/lib/relation.js
@@ -265,7 +265,7 @@ _.extend(BookshelfRelation.prototype, {
       if (!this.isInverse()) {
         groupedKey = model.id;
       } else {
-        var formatted = model.format(model.attributes);
+        var formatted = model.format(_.extend(Object.create(null), model.attributes));
         groupedKey = this.isThrough() ? formatted[this.key('throughForeignKey')] : formatted[this.key('foreignKey')];
       }
       var relation = model.relations[relationName] = this.relatedInstance(grouped[groupedKey]);

diff --git a/test/integration/model.js b/test/integration/model.js
@@ -222,7 +222,7 @@ module.exports = function(bookshelf) {
       // TODO: better way to test this.
       it('calls format when saving', function() {
 
-        var M = Backbone.Model.extend({
+        var M = bookshelf.Model.extend({
           tableName: 'test',
           format: function(attrs) {
             return _.reduce(attrs, function(memo, val, key) {
@@ -243,6 +243,19 @@ module.exports = function(bookshelf) {
 
       });
 
+      it('does not mutate attributes on format', function() {
+
+        var M = bookshelf.Model.extend({
+          tableName: 'sites',
+          format: function(attrs) {
+            assert.ok(attrs !== this.attributes);
+            return attrs;
+          }
+        });
+
+        return M.forge({id: 1}).fetch().call('load');
+      });
+
     });
 
     describe('fetch', function() {