Merge branch 'master' of github.com:sdepold/sequelize

lib/dao-factory.js

@@ -140,6 +140,10 @@ module.exports = (function() {
 
 
       includes.forEach(function(daoName) {
       includes.forEach(function(daoName) {
         options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
         options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
+
+        if (!options.include[daoName]) {
+          options.include[daoName] = this.getAssociationByAlias(daoName).target
+        }
       }.bind(this))
       }.bind(this))
     }
     }
 
 

lib/dialects/mysql/connector-manager.js

@@ -24,6 +24,9 @@ module.exports = (function() {
       if (!this.poolCfg.maxConnections) {
       if (!this.poolCfg.maxConnections) {
         this.poolCfg.maxConnections = 10
         this.poolCfg.maxConnections = 10
       }
       }
+      if (!this.poolCfg.minConnections) {
+        this.poolCfg.minConnections = 0
+      }
       this.pool = Pooling.Pool({
       this.pool = Pooling.Pool({
         name: 'sequelize-mysql',
         name: 'sequelize-mysql',
         create: function (done) {
         create: function (done) {
@@ -33,6 +36,7 @@ module.exports = (function() {
             disconnect.call(self, client)
             disconnect.call(self, client)
         },
         },
         max: self.poolCfg.maxConnections,
         max: self.poolCfg.maxConnections,
+        min: self.poolCfg.minConnections,
         idleTimeoutMillis: self.poolCfg.maxIdleTime
         idleTimeoutMillis: self.poolCfg.maxIdleTime
       })
       })
     }
     }