mysql is working :)

lib/dao-factory.js

@@ -143,23 +143,16 @@ module.exports = (function() {
     var hasJoin = false
     var hasJoin = false
     var options = Utils._.clone(options)
     var options = Utils._.clone(options)
 
 
-    if ((typeof options === 'object') && (options.hasOwnProperty('include'))) {
-      var includes = options.include
+    if (typeof options === 'object') {
+      hasJoin = true
 
 
-      hasJoin         = true
-      options.include = {}
-
-      /*options.include =*/ includes.map(function(include) {
-        console.log(include instanceof DAOFactory)
-      })
-
-      includes.forEach(function(daoName) {
-        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
 
 
-        if (!options.include[daoName]) {
-          options.include[daoName] = this.getAssociationByAlias(daoName).target
-        }
-      }.bind(this))
+        options.include = options.include.map(function(include) {
+          return validateIncludedElement.call(this, include)
+        }.bind(this))
+      }
 
 
       // whereCollection is used for non-primary key updates
       // whereCollection is used for non-primary key updates
       this.options.whereCollection = options.where || null
       this.options.whereCollection = options.where || null

lib/query-interface.js

@@ -198,6 +198,8 @@ module.exports = (function() {
   }
   }
 
 
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
+    options = options || {}
+
     var sql = this.QueryGenerator.selectQuery(tableName, options)
     var sql = this.QueryGenerator.selectQuery(tableName, options)
     queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
     queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')