Merge pull request #1615 from cusspvz/master

Test for #1614

lib/dialects/abstract/query-generator.js

@@ -779,7 +779,7 @@ module.exports = (function() {
               joinQueryItem += " AND "+self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.daoFactory, whereOptions)
               joinQueryItem += " AND "+self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.daoFactory, whereOptions)
 
 
               // If its a multi association we need to add a where query to the main where (executed in the subquery)
               // If its a multi association we need to add a where query to the main where (executed in the subquery)
-              if (subQuery && association.isMultiAssociation) {
+              if (subQuery && association.isMultiAssociation && include.required) {
                 if (!options.where) options.where = {}
                 if (!options.where) options.where = {}
 
 
                 // Creating the as-is where for the subQuery, checks that the required association exists
                 // Creating the as-is where for the subQuery, checks that the required association exists

test/associations/has-many.test.js

@@ -698,6 +698,30 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
         })
         })
       })
       })
 
 
+      it("get associated objects with an eager load with conditions but not required", function(done) {
+        var Label = this.sequelize.define('Label', { 'title': DataTypes.STRING, 'isActive': DataTypes.BOOLEAN })
+          , Task = this.Task
+          , User = this.User
+
+        Task.hasMany(Label)
+
+        Label.sync({ force: true }).success(function() {
+          User.find({
+            where: { username: 'John'},
+            include: [
+              { model: Task, required: false, include: [
+                { model: Label, required: false, where: { isActive: true } }
+              ]}
+            ]
+          }).done(function (err, john) {
+            expect(err).not.to.be.ok
+            expect(john.tasks).to.have.length(2);
+            done();
+          })
+
+        })
+      })
+
       it('should support schemas', function (done) {
       it('should support schemas', function (done) {
         var self = this
         var self = this
           , AcmeUser = self.sequelize.define('User', {
           , AcmeUser = self.sequelize.define('User', {