Merge pull request #1199 from mickhansen/association-filtering

Association filtering and inner join

lib/dao-factory.js

@@ -1337,6 +1337,13 @@ module.exports = (function() {
             include.include.push(include.through)
             include.include.push(include.through)
           }
           }
 
 
+          if (include.required === undefined) {
+            include.required = false
+            if (include.where) {
+              include.required = true
+            }
+          }
+
           // Validate child includes
           // Validate child includes
           if (include.hasOwnProperty('include')) {
           if (include.hasOwnProperty('include')) {
             validateIncludedElements(include)
             validateIncludedElements(include)

lib/dialects/abstract/query-generator.js

@@ -493,9 +493,23 @@ module.exports = (function() {
             , attributes
             , attributes
             , association   = include.association
             , association   = include.association
             , through       = include.through
             , through       = include.through
+            , joinType      = include.required ? ' INNER JOIN ' : ' LEFT OUTER JOIN '
+            , where         = {}
+            , whereOptions  = Utils._.clone(options)
 
 
           if (tableName !== parentTable) as = parentTable+'.'+include.as
           if (tableName !== parentTable) as = parentTable+'.'+include.as
 
 
+          if (include.where) {
+            for (var key in include.where) {
+              if (include.where.hasOwnProperty(key)) {
+                where[self.quoteIdentifier(as)+'.'+self.quoteIdentifiers(key)] = include.where[key]
+              }
+            }
+
+            include.where = where
+            whereOptions.keysEscaped = true
+          }
+
           attributes  = include.attributes.map(function(attr) {
           attributes  = include.attributes.map(function(attr) {
             return self.quoteIdentifier(as) + "." + self.quoteIdentifier(attr) + " AS " + self.quoteIdentifier(as + "." + attr)
             return self.quoteIdentifier(as) + "." + self.quoteIdentifier(attr) + " AS " + self.quoteIdentifier(as + "." + attr)
           })
           })
@@ -521,13 +535,17 @@ module.exports = (function() {
               , identTarget       = association.foreignIdentifier
               , identTarget       = association.foreignIdentifier
               , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
               , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
 
 
-            joinQueryItem += " LEFT OUTER JOIN " + self.quoteIdentifier(throughTable) + " AS " + self.quoteIdentifier(throughAs) + " ON "
+            joinQueryItem += joinType + self.quoteIdentifier(throughTable) + " AS " + self.quoteIdentifier(throughAs) + " ON "
               joinQueryItem += self.quoteIdentifier(tableSource) + "." + self.quoteIdentifier(attrSource) + " = "
               joinQueryItem += self.quoteIdentifier(tableSource) + "." + self.quoteIdentifier(attrSource) + " = "
               joinQueryItem += self.quoteIdentifier(throughAs) + "." + self.quoteIdentifier(identSource)
               joinQueryItem += self.quoteIdentifier(throughAs) + "." + self.quoteIdentifier(identSource)
             
             
-            joinQueryItem += " LEFT OUTER JOIN " + self.quoteIdentifier(table) + " AS " + self.quoteIdentifier(as) + " ON "
+            joinQueryItem += joinType + self.quoteIdentifier(table) + " AS " + self.quoteIdentifier(as) + " ON "
               joinQueryItem += self.quoteIdentifier(tableTarget) + "." + self.quoteIdentifier(attrTarget) + " = "
               joinQueryItem += self.quoteIdentifier(tableTarget) + "." + self.quoteIdentifier(attrTarget) + " = "
               joinQueryItem += self.quoteIdentifier(throughAs) + "." + self.quoteIdentifier(identTarget)
               joinQueryItem += self.quoteIdentifier(throughAs) + "." + self.quoteIdentifier(identTarget)
+
+            if (include.where) {
+              joinQueryItem += " AND "+self.hashToWhereConditions(include.where, include.daoFactory, whereOptions)
+            }
           } else {
           } else {
             var primaryKeysLeft = ((association.associationType === 'BelongsTo') ? Object.keys(association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
             var primaryKeysLeft = ((association.associationType === 'BelongsTo') ? Object.keys(association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
               , tableLeft       = ((association.associationType === 'BelongsTo') ? as : parentTable)
               , tableLeft       = ((association.associationType === 'BelongsTo') ? as : parentTable)
@@ -535,7 +553,13 @@ module.exports = (function() {
               , tableRight      = ((association.associationType === 'BelongsTo') ? parentTable : as)
               , tableRight      = ((association.associationType === 'BelongsTo') ? parentTable : as)
               , attrRight       = association.identifier
               , attrRight       = association.identifier
 
 
-            joinQueryItem += " LEFT OUTER JOIN " + self.quoteIdentifier(table) + " AS " + self.quoteIdentifier(as) + " ON " + self.quoteIdentifier(tableLeft) + "." + self.quoteIdentifier(attrLeft) + " = " + self.quoteIdentifier(tableRight) + "." + self.quoteIdentifier(attrRight)
+            joinQueryItem += joinType + self.quoteIdentifier(table) + " AS " + self.quoteIdentifier(as) + " ON "
+              joinQueryItem += self.quoteIdentifier(tableLeft) + "." + self.quoteIdentifier(attrLeft) + " = "
+              joinQueryItem += self.quoteIdentifier(tableRight) + "." + self.quoteIdentifier(attrRight)
+
+            if (include.where) {
+              joinQueryItem += " AND "+self.hashToWhereConditions(include.where, include.daoFactory, whereOptions)
+            }
           }
           }
 
 
           if (include.include) {
           if (include.include) {
@@ -821,15 +845,21 @@ module.exports = (function() {
     hashToWhereConditions: function(hash, dao, options) {
     hashToWhereConditions: function(hash, dao, options) {
       var result = []
       var result = []
 
 
+      options = options || {}
+
       for (var key in hash) {
       for (var key in hash) {
         var value = hash[key]
         var value = hash[key]
           ,  _key
           ,  _key
           , _value = null
           , _value = null
 
 
-        if(this.isAssociationFilter(key, dao, options)){
-          _key = key = this.getAssociationFilterColumn(key, dao, options);
+        if (options.keysEscaped) {
+          _key = key
         } else {
         } else {
-          _key = this.quoteIdentifiers(key)
+          if(this.isAssociationFilter(key, dao, options)){
+            _key = key = this.getAssociationFilterColumn(key, dao, options);
+          } else {
+            _key = this.quoteIdentifiers(key)
+          }
         }
         }
 
 
          //handle qualified key names
          //handle qualified key names