update select query generator to handle nested belongsTo

lib/dialects/abstract/query-generator.js

@@ -361,8 +361,9 @@ module.exports = (function() {
         - offset -> An offset value to start from. Only useable with limit!
         - offset -> An offset value to start from. Only useable with limit!
     */
     */
     selectQuery: function(tableName, options, factory) {
     selectQuery: function(tableName, options, factory) {
-      var table = null,
-          joinQuery = ""
+      var table = null
+        , self = this
+        , joinQuery = ""
 
 
       options            = options || {}
       options            = options || {}
       options.table      = table = Array.isArray(tableName) ? tableName.map(function(t) { return this.quoteIdentifiers(t) }.bind(this)).join(", ") : this.quoteIdentifiers(tableName)
       options.table      = table = Array.isArray(tableName) ? tableName.map(function(t) { return this.quoteIdentifiers(t) }.bind(this)).join(", ") : this.quoteIdentifiers(tableName)
@@ -378,27 +379,19 @@ module.exports = (function() {
       if (options.include) {
       if (options.include) {
         var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
         var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
 
 
-        options.include.forEach(function(include) {
-          var attributes = include.attributes.map(function(attr) {
-            return this.quoteIdentifier(include.as) + "." + this.quoteIdentifier(attr) + " AS " + this.quoteIdentifier(include.as + "." + attr)
-          }.bind(this))
+        var generateJoinQuery = function(include, parentTable) {
+          var table         = include.daoFactory.tableName
+            , as            = include.as
+            , joinQueryItem = ""
+            , attributes = include.attributes.map(function(attr) {
+              return self.quoteIdentifier(as) + "." + self.quoteIdentifier(attr) + " AS " + self.quoteIdentifier(include.as + "." + attr)
+            })
 
 
           optAttributes = optAttributes.concat(attributes)
           optAttributes = optAttributes.concat(attributes)
 
 
-          var table = include.daoFactory.tableName
-            , as    = include.as
-
-          if (!(Object(include.association.through) === include.association.through)) {
-            var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
-              , tableLeft       = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
-              , attrLeft        = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
-              , tableRight      = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
-              , attrRight       = include.association.identifier
-
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight)
-          } else {
+          if (include.association.doubleLinked) {
             var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
             var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
-              , tableSource       = tableName
+              , tableSource       = parentTable
               , identSource       = include.association.identifier
               , identSource       = include.association.identifier
               , attrSource        = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
               , attrSource        = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
 
 
@@ -408,9 +401,29 @@ module.exports = (function() {
               , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
               , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
 
 
             var tableJunction     = include.association.through.tableName
             var tableJunction     = include.association.through.tableName
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableSource) + "." + this.quoteIdentifier(attrSource) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identSource)
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableTarget) + "." + this.quoteIdentifier(attrTarget) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identTarget)
+            joinQueryItem += " LEFT OUTER JOIN " + self.quoteIdentifier(tableJunction) + " ON " + self.quoteIdentifier(tableSource) + "." + self.quoteIdentifier(attrSource) + " = " + self.quoteIdentifier(tableJunction) + "." + self.quoteIdentifier(identSource)
+            joinQueryItem += " LEFT OUTER JOIN " + self.quoteIdentifier(table) + " AS " + self.quoteIdentifier(as) + " ON " + self.quoteIdentifier(tableTarget) + "." + self.quoteIdentifier(attrTarget) + " = " + self.quoteIdentifier(tableJunction) + "." + self.quoteIdentifier(identTarget)
+          } else {
+            var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
+              , tableLeft       = ((include.association.associationType === 'BelongsTo') ? include.as : parentTable)
+              , attrLeft        = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
+              , tableRight      = ((include.association.associationType === 'BelongsTo') ? parentTable : include.as)
+              , attrRight       = include.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)
+          }
+
+          if (include.include) {
+            include.include.forEach(function(childInclude) {
+              joinQueryItem += generateJoinQuery(childInclude, as)
+            }.bind(this))
           }
           }
+
+          return joinQueryItem
+        }
+
+        options.include.forEach(function(include) {
+          joinQuery += generateJoinQuery(include, tableName)
         }.bind(this))
         }.bind(this))
 
 
         options.attributes = optAttributes.join(', ')
         options.attributes = optAttributes.join(', ')