extracted log in order to be able to use it somewhere else

lib/dialects/abstract/query.js

@@ -259,20 +259,7 @@ module.exports = (function() {
 
 
       result = result.map(Dot.transform)
       result = result.map(Dot.transform)
     } else if (this.options.hasJoin === true) {
     } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
-        // let's build the actual dao instance first...
-        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
-
-        // ... and afterwards the prefetched associations
-        for (var tableName in result) {
-          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
-            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
-          }
-        }
-
-        return dao
-      }.bind(this))
+      result = transformRowsWithEagerLoadingIntoDaos.call(this, results)
     } else {
     } else {
       result = results.map(function(result) {
       result = results.map(function(result) {
         return this.callee.build(result, { isNewRecord: false })
         return this.callee.build(result, { isNewRecord: false })
@@ -287,6 +274,31 @@ module.exports = (function() {
     return result
     return result
   }
   }
 
 
+  var transformRowsWithEagerLoadingIntoDaos = function(results) {
+    var result = []
+
+    result = prepareJoinData.call(this, results)
+    result = groupDataByCalleeFactory.call(this, result).map(function(result) {
+      return transformRowWithEagerLoadingIntoDao.call(this, result)
+    }.bind(this))
+
+    return result
+  }
+
+  var transformRowWithEagerLoadingIntoDao = function(result, dao) {
+    // let's build the actual dao instance first...
+    dao = dao || this.callee.build(result[this.callee.tableName], { isNewRecord: false })
+
+    // ... and afterwards the prefetched associations
+    for (var tableName in result) {
+      if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
+        buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
+      }
+    }
+
+    return dao
+  }
+
   var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
   var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
     var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
     var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
       , association          = null
       , association          = null
@@ -311,7 +323,7 @@ module.exports = (function() {
 
 
     associationData.forEach(function(data) {
     associationData.forEach(function(data) {
       var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
       var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
+        , isEmpty     = !Utils.firstValueOfHash(daoInstance.identifiers)
 
 
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
         accessor = Utils.singularize(accessor)
         accessor = Utils.singularize(accessor)
@@ -326,7 +338,8 @@ module.exports = (function() {
 
 
       // add the accessor to the eagerly loaded associations array
       // add the accessor to the eagerly loaded associations array
       dao.__eagerlyLoadedAssociations = Utils._.uniq(dao.__eagerlyLoadedAssociations.concat([accessor]))
       dao.__eagerlyLoadedAssociations = Utils._.uniq(dao.__eagerlyLoadedAssociations.concat([accessor]))
-    })
+      dao.__eagerlyLoadedOptions      = (this.options && this.options.include) ? this.options.include : []
+    }.bind(this))
   }
   }
 
 
   var isShowOrDescribeQuery = function() {
   var isShowOrDescribeQuery = function() {