Merge branch 'master' of https://github.com/ErikvdVen/sequelize into ErikvdVen-master

test/include/findAll.test.js

@@ -1750,6 +1750,32 @@ describe(Support.getTestDialectTeaser('Include'), function() {
       });
       });
     });
     });
 
 
+
+    it('should be possible to select on columns inside a through table', function(done) {
+      var self = this;
+      this.fixtureA(function() {
+        self.models.Product.findAll({
+          attributes: ['title'],
+          include: [
+            {
+              model: self.models.Tag,
+              through: {
+                where: {
+                  ProductId: 3
+                }
+              },
+              required: true
+            }
+          ]
+        }).done(function(err, products) {
+          expect(err).not.to.be.ok;
+          expect(products).have.length(1);
+
+          done();
+        });
+      });
+    });
+
     // Test case by @eshell
     // Test case by @eshell
     it('should be possible not to include the main id in the attributes', function(done) {
     it('should be possible not to include the main id in the attributes', function(done) {
       var Member = this.sequelize.define('Member', {
       var Member = this.sequelize.define('Member', {
@@ -1999,18 +2025,18 @@ describe(Support.getTestDialectTeaser('Include'), function() {
         });
         });
       });
       });
     });
     });
-    
+
     it('should work on a nested set of required 1:1 relations', function () {
     it('should work on a nested set of required 1:1 relations', function () {
       var Person = this.sequelize.define("Person", {
       var Person = this.sequelize.define("Person", {
-        name: { 
+        name: {
           type          : Sequelize.STRING,
           type          : Sequelize.STRING,
           allowNull     : false
           allowNull     : false
         }
         }
       });
       });
 
 
       var UserPerson = this.sequelize.define("UserPerson", {
       var UserPerson = this.sequelize.define("UserPerson", {
-        PersonId: { 
-          type          : Sequelize.INTEGER, 
+        PersonId: {
+          type          : Sequelize.INTEGER,
           primaryKey    : true
           primaryKey    : true
         },
         },
 
 
@@ -2020,8 +2046,8 @@ describe(Support.getTestDialectTeaser('Include'), function() {
       });
       });
 
 
       var User = this.sequelize.define("User", {
       var User = this.sequelize.define("User", {
-        UserPersonId: { 
-          type          : Sequelize.INTEGER, 
+        UserPersonId: {
+          type          : Sequelize.INTEGER,
           primaryKey    : true
           primaryKey    : true
         },
         },
 
 
@@ -2032,20 +2058,20 @@ describe(Support.getTestDialectTeaser('Include'), function() {
         }
         }
       });
       });
 
 
-      UserPerson.belongsTo(Person, { 
-        foreignKey: { 
+      UserPerson.belongsTo(Person, {
+        foreignKey: {
           allowNull: false
           allowNull: false
         },
         },
         onDelete: 'CASCADE'
         onDelete: 'CASCADE'
       });
       });
-      Person.hasOne(UserPerson, { 
-        foreignKey: { 
+      Person.hasOne(UserPerson, {
+        foreignKey: {
           allowNull: false
           allowNull: false
         },
         },
         onDelete: 'CASCADE'
         onDelete: 'CASCADE'
       });
       });
-      
-      User.belongsTo(UserPerson, { 
+
+      User.belongsTo(UserPerson, {
         foreignKey: {
         foreignKey: {
           name: 'UserPersonId',
           name: 'UserPersonId',
           allowNull: false
           allowNull: false
@@ -2053,7 +2079,7 @@ describe(Support.getTestDialectTeaser('Include'), function() {
         onDelete: 'CASCADE'
         onDelete: 'CASCADE'
       });
       });
       UserPerson.hasOne(User, {
       UserPerson.hasOne(User, {
-        foreignKey: { 
+        foreignKey: {
           name: 'UserPersonId',
           name: 'UserPersonId',
           allowNull: false
           allowNull: false
         },
         },
@@ -2063,12 +2089,12 @@ describe(Support.getTestDialectTeaser('Include'), function() {
       return this.sequelize.sync({force: true}).then(function () {
       return this.sequelize.sync({force: true}).then(function () {
         return Person.findAll({
         return Person.findAll({
           offset        : 0,
           offset        : 0,
-          limit         : 20, 
+          limit         : 20,
           attributes    : ['id', 'name'],
           attributes    : ['id', 'name'],
           include       : [{
           include       : [{
-            model         : UserPerson, 
-            required      : true, 
-            attributes    : ['rank'], 
+            model         : UserPerson,
+            required      : true,
+            attributes    : ['rank'],
             include       : [{
             include       : [{
               model         : User,
               model         : User,
               required      : true,
               required      : true,