Merge branch 'vpontis-error-association-fields'

changelog.md

 # Next
 # Next
 - [BUG] Add support for `field` named the same as the attribute in `reload`, `bulkCreate` and `save` [#2348](https://github.com/sequelize/sequelize/issues/2348)
 - [BUG] Add support for `field` named the same as the attribute in `reload`, `bulkCreate` and `save` [#2348](https://github.com/sequelize/sequelize/issues/2348)
 - [BUG] Copy the options object in association getters. [#2311](https://github.com/sequelize/sequelize/issues/2311)
 - [BUG] Copy the options object in association getters. [#2311](https://github.com/sequelize/sequelize/issues/2311)
+- [BUG] `Model#destroy()` now supports `field`, this also fixes an issue with `N:M#removeAssociation` and `field`
 
 
 #### Backwards compatability changes
 #### Backwards compatability changes
 - When eager-loading a many-to-many association, the attributes of the through table are now accessible through an attribute named after the through model rather than the through table name singularized. i.e. `Task.find({include: Worker})` where the table name for through model `TaskWorker` is `TableTaskWorkers` used to produce `{ Worker: { ..., TableTaskWorker: {...} } }`. It now produces `{ Worker: { ..., TaskWorker: {...} } }`. Does not affect models where table name is auto-defined by Sequelize, or where table name is model name pluralized.
 - When eager-loading a many-to-many association, the attributes of the through table are now accessible through an attribute named after the through model rather than the through table name singularized. i.e. `Task.find({include: Worker})` where the table name for through model `TaskWorker` is `TableTaskWorkers` used to produce `{ Worker: { ..., TableTaskWorker: {...} } }`. It now produces `{ Worker: { ..., TaskWorker: {...} } }`. Does not affect models where table name is auto-defined by Sequelize, or where table name is model name pluralized.

lib/model.js

@@ -1344,6 +1344,8 @@ module.exports = (function() {
     var self = this
     var self = this
       , instances;
       , instances;
 
 
+    mapFieldNames.call(this, options, this);
+
     return Promise.try(function() {
     return Promise.try(function() {
       // Run before hook
       // Run before hook
       if (options.hooks) {
       if (options.hooks) {

test/associations/has-many.test.js

@@ -1573,6 +1573,8 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
             self.Project.create({name: 'Good Will Hunting'})
             self.Project.create({name: 'Good Will Hunting'})
           ]);
           ]);
         }).spread(function (user, project) {
         }).spread(function (user, project) {
+          self.user = user;
+          self.project = project;
           return user.addProject(project).return(user);
           return user.addProject(project).return(user);
         }).then(function(user) {
         }).then(function(user) {
           return user.getProjects();
           return user.getProjects();
@@ -1580,6 +1582,10 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
           var project = projects[0];
           var project = projects[0];
 
 
           expect(project).to.be.defined;
           expect(project).to.be.defined;
+          return self.user.removeProject(project).on('sql', function (sql) {
+          }).return(project);
+        }).then(function(project) {
+          return self.user.setProjects([project]);
         });
         });
       });
       });
 
 

test/dao-factory.test.js

@@ -1048,6 +1048,31 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it('supports .field', function () {
+      var UserProject = this.sequelize.define('UserProject', {
+        userId: {
+          type: DataTypes.INTEGER,
+          field: 'user_id'
+        }
+      });
+
+      return UserProject.sync({force: true}).then(function () {
+        return UserProject.create({
+          userId: 10
+        });
+      }).then(function (userProject) {
+        return UserProject.destroy({
+          where: {
+            userId: 10
+          }
+        });
+      }).then(function () {
+        return UserProject.findAll();
+      }).then(function (userProjects) {
+        expect(userProjects.length).to.equal(0);
+      });
+    });
+
     it('sets deletedAt to the current timestamp if paranoid is true', function(done) {
     it('sets deletedAt to the current timestamp if paranoid is true', function(done) {
       var self = this
       var self = this
         , ParanoidUser = self.sequelize.define('ParanoidUser', {
         , ParanoidUser = self.sequelize.define('ParanoidUser', {