不要怂,就是干,撸起袖子干!

Commit ac28303c by Sascha Depold

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

2 parents 7481c2cb 8e4f6cdc
......@@ -140,6 +140,10 @@ module.exports = (function() {
includes.forEach(function(daoName) {
options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
if (!options.include[daoName]) {
options.include[daoName] = this.getAssociationByAlias(daoName).target
}
}.bind(this))
}
......
......@@ -24,6 +24,9 @@ module.exports = (function() {
if (!this.poolCfg.maxConnections) {
this.poolCfg.maxConnections = 10
}
if (!this.poolCfg.minConnections) {
this.poolCfg.minConnections = 0
}
this.pool = Pooling.Pool({
name: 'sequelize-mysql',
create: function (done) {
......@@ -33,6 +36,7 @@ module.exports = (function() {
disconnect.call(self, client)
},
max: self.poolCfg.maxConnections,
min: self.poolCfg.minConnections,
idleTimeoutMillis: self.poolCfg.maxIdleTime
})
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!