Adding support for filter through hasMany

lib/dialects/sqlite/query-generator.js

@@ -239,20 +239,42 @@ module.exports = (function() {
             key.split('.').forEach(function(attribute){
               var isAssociation = false;
               Object.keys(dao.associations).forEach(function(associationName){
-                var accessor = dao.associations[associationName].associationAccessor
+                if(!dao.associations[associationName]) return;
 
-                accessor = Utils.singularize(accessor[0].toLowerCase() + accessor.slice(1));
+                var accessor,
+                    associationType = dao.associations[associationName].associationType;
 
+                if(associationType === 'HasMany') {
+                  accessor = dao.associations[associationName].accessors.get.replace('get', '')
+                  accessor = accessor[0].toLowerCase() + accessor.slice(1);
+                } else {
+                  accessor = dao.associations[associationName].associationAccessor
+                  accessor = Utils.singularize(accessor[0].toLowerCase() + accessor.slice(1))
+                }
+
+                accessor = accessor[0].toLowerCase() + accessor.slice(1);
 
                 if(attribute === accessor){
-                  var targetTableName = dao.associations[associationName].target.tableName
-                    , targetColumnName = dao.associations[associationName].target.autoIncrementField
-                    , sourceTableName = dao.tableName
-                    , sourceColumnName = dao.associations[associationName].identifier
-
-                  innerQuery += '\r\n\r\nLEFT JOIN ' + self.quoteIdentifier(targetTableName)
-                  innerQuery += '\r\nON ' + self.quoteIdentifier(targetTableName) + '.'  + self.quoteIdentifier(targetColumnName) + ' = ' + self.quoteIdentifier(sourceTableName) + '.' + self.quoteIdentifier(sourceColumnName)
-                  dao = dao.associations[associationName].target;
+                  if(associationType === 'BelongsTo') {
+                    var targetTableName = dao.associations[associationName].target.tableName
+                      , targetColumnName = dao.associations[associationName].target.autoIncrementField
+                      , sourceTableName = dao.tableName
+                      , sourceColumnName = dao.associations[associationName].identifier
+
+                    innerQuery += '\r\n\r\nLEFT JOIN ' + self.quoteIdentifier(targetTableName)
+                    innerQuery += '\r\nON ' + self.quoteIdentifier(targetTableName) + '.'  + self.quoteIdentifier(targetColumnName) + ' = ' + self.quoteIdentifier(sourceTableName) + '.' + self.quoteIdentifier(sourceColumnName)
+                    dao = dao.associations[associationName].target;
+                  } else {
+                    var targetTableName = dao.associations[associationName].target.tableName
+                      , targetColumnName = dao.associations[associationName].identifier
+                      , sourceTableName = dao.tableName
+                      , sourceColumnName = dao.associations[associationName].source.autoIncrementField
+
+                    innerQuery += '\r\n\r\nLEFT JOIN ' + self.quoteIdentifier(targetTableName)
+                    innerQuery += '\r\nON ' + self.quoteIdentifier(targetTableName) + '.'  + self.quoteIdentifier(targetColumnName) + ' = ' + self.quoteIdentifier(sourceTableName) + '.' + self.quoteIdentifier(sourceColumnName)
+
+                    dao = dao.associations[associationName].target;
+                  }
                   isAssociation = true;
                 }
               });

test/associations/multiple-level-filters.test.js

@@ -7,16 +7,16 @@ var chai      = require('chai')
 chai.Assertion.includeStack = true
 
 describe(Support.getTestDialectTeaser("Multiple Level Filters"), function() {
-  it('can filter through relations', function(done) {
+  it('can filter through belongsTo', function(done) {
     var User = this.sequelize.define('User', {username: DataTypes.STRING })
       , Task = this.sequelize.define('Task', {title: DataTypes.STRING })
       , Project = this.sequelize.define('Project', { title: DataTypes.STRING })
 
     Project.belongsTo(User);
-    //User.hasMany(Project)
+    User.hasMany(Project)
 
     Task.belongsTo(Project);
-    //Project.hasMany(Task);
+    Project.hasMany(Task);
 
 
     this.sequelize.sync({ force: true }).success(function() {
@@ -72,4 +72,69 @@ describe(Support.getTestDialectTeaser("Multiple Level Filters"), function() {
       });
     })
   })
+
+  it('can filter through hasMany', function(done) {
+    var User = this.sequelize.define('User', {username: DataTypes.STRING })
+      , Task = this.sequelize.define('Task', {title: DataTypes.STRING })
+      , Project = this.sequelize.define('Project', { title: DataTypes.STRING })
+
+    Project.belongsTo(User);
+    User.hasMany(Project)
+
+    Task.belongsTo(Project);
+    Project.hasMany(Task);
+
+
+    this.sequelize.sync({ force: true }).success(function() {
+      User.bulkCreate([{
+        id: 101,
+        username: 'leia'
+      }, {
+        id: 102,
+        username: 'vader'
+      }]).success(function() {
+        Project.bulkCreate([{
+          id: 201,
+          UserId: 101,
+          title: 'republic'
+        },{
+          id: 202,
+          UserId: 102,
+          title: 'empire'
+        }]).success(function() {
+          Task.bulkCreate([{
+            id: 301,
+            ProjectId: 201,
+            title: 'fight empire'
+          },{
+            id: 302,
+            ProjectId: 201,
+            title: 'stablish republic'
+          },{
+            id: 303,
+            ProjectId: 202,
+            title: 'destroy rebel alliance'
+          },{
+            id: 304,
+            ProjectId: 202,
+            title: 'rule everything'
+          }]).success(function() {
+            User.findAll({
+              where: {
+                'projects.tasks.title': 'fight empire'
+              }
+            }).success(function(users){
+              try{
+                expect(users.length).to.be.equal(1);
+                expect(users[0].username).to.be.equal('leia');
+                done();
+              }catch(e){
+                done(e);
+              }
+            })
+          });
+        });
+      });
+    })
+  })
 })