fixed formatting of join query results

lib/dialects/abstract/query.js

@@ -122,13 +122,37 @@ module.exports = (function() {
   // private //
   // private //
   /////////////
   /////////////
 
 
+  var findTableNameInAttribute = function(attribute) {
+    var tableName = null
+
+    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
+      if (!!tableName) {
+        return
+      } else {
+        var regExp = new RegExp("^" + daoFactory.tableName + "\\.")
+          , match  = attribute.match(regExp)
+
+        if (!!match) {
+          tableName = daoFactory.tableName
+        }
+      }
+    })
+
+    return tableName
+  }
+
   var queryResultHasJoin = function(results) {
   var queryResultHasJoin = function(results) {
-    var hasJoin = !!results[0]
+    if (!!results[0]) {
+      var keys = Utils._.keys(results[0])
 
 
-    hasJoin = hasJoin && (Utils._.keys(results[0]).length > 1)
-    hasJoin = hasJoin && (Utils.isHash(results[0][Utils._.keys(results[0])[0]]))
+      for (var i = 0; i < keys.length; i++) {
+        if (!!findTableNameInAttribute.call(this, keys[i])) {
+          return true
+        }
+      }
+    }
 
 
-    return hasJoin
+    return false
   }
   }
 
 
   var isInsertQuery = function(results) {
   var isInsertQuery = function(results) {
@@ -169,8 +193,9 @@ module.exports = (function() {
 
 
     if (this.options.raw) {
     if (this.options.raw) {
       result = results
       result = results
-    } else if (queryResultHasJoin(results)) {
-      result = groupDataByCalleeFactory.call(this, results).map(function(result) {
+    } else if (queryResultHasJoin.call(this, results)) {
+      result = prepareJoinData.call(this, results)
+      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
         // let's build the actual dao instance first...
         // let's build the actual dao instance first...
         var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
         var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
 
 
@@ -287,5 +312,36 @@ module.exports = (function() {
     return result
     return result
   }
   }
 
 
+
+  /**
+   * This function will prepare the result of select queries with joins.
+   *
+   * @param  {Array} data This array contains objects.
+   * @return {Array}      The array will have the needed format for groupDataByCalleeFactory.
+   */
+  var prepareJoinData = function(data) {
+    var result = data.map(function(row) {
+      var nestedRow = {}
+
+      for (var key in row) {
+        if (row.hasOwnProperty(key)) {
+          var tableName = findTableNameInAttribute.call(this, key)
+
+          if (!!tableName) {
+            nestedRow[tableName] = nestedRow[tableName] || {}
+            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
+          } else {
+            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
+            nestedRow[this.callee.tableName][key] = row[key]
+          }
+        }
+      }
+
+      return nestedRow
+    }.bind(this))
+
+    return result
+  }
+
   return AbstractQuery
   return AbstractQuery
 })()
 })()