Merge pull request #1267 from sequelize/hotfix/transaction-pooling-config

Hotfix/transaction pooling config

lib/dialects/sqlite/connector-manager.js

@@ -5,6 +5,7 @@ var sqlite3
 module.exports = (function() {
   var ConnectorManager = function(sequelize, config) {
     this.sequelize = sequelize
+    this.config    = config
 
     if (config.dialectModulePath) {
       sqlite3 = require(config.dialectModulePath).verbose()

lib/transaction-manager.js

@@ -18,7 +18,14 @@ TransactionManager.prototype.getConnectorManager = function(uuid) {
     var config = Utils._.extend({ uuid: uuid }, this.sequelize.config)
 
     if (uuid !== 'default') {
-      config.pool                = { maxConnections: 0, useReplicaton: false }
+      config.pool = Utils._.extend(
+        {},
+        Utils._.clone(config.pool || {}),
+        {
+          maxConnections: 0,
+          useReplicaton: false
+        }
+      )
       config.keepDefaultTimezone = true
     }
 

test/config/config.js

@@ -21,7 +21,7 @@ module.exports = {
     port:     process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
     pool:     {
       maxConnections: process.env.SEQ_MYSQL_POOL_MAX  || process.env.SEQ_POOL_MAX  || 5,
-      maxIdleTime:    process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 30
+      maxIdleTime:    process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
     }
   },
 
@@ -47,7 +47,7 @@ module.exports = {
     host:     process.env.SEQ_MYSQL_HOST || process.env.SEQ_HOST || '127.0.0.1',
     port:     process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
     pool:     {
-      maxConnections: process.env.SEQ_MYSQL_POOL_MAX  || process.env.SEQ_POOL_MAX  || 1,
+      maxConnections: process.env.SEQ_MYSQL_POOL_MAX  || process.env.SEQ_POOL_MAX  || 5,
       maxIdleTime:    process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
     }
   }

test/transaction-manager.test.js

+var chai               = require('chai')
+  , expect             = chai.expect
+  , Support            = require(__dirname + '/support')
+  , TransactionManager = require(__dirname + '/../lib/transaction-manager')
+
+describe(Support.getTestDialectTeaser("TransactionManager"), function () {
+  beforeEach(function() {
+    this.transactionManager = new TransactionManager(this.sequelize)
+  })
+
+  describe('getConnectorManager', function() {
+    describe('if no uuid is passed', function() {
+      it('uses the default connector', function() {
+        var connectorManager = this.transactionManager.getConnectorManager()
+        expect(connectorManager.config.uuid).to.equal('default')
+      })
+
+      it('uses the pooling configuration of sequelize', function() {
+        var connectorManager = this.transactionManager.getConnectorManager()
+          , self             = this
+
+        if (Support.getTestDialect() !== 'sqlite') {
+          expect(this.sequelize.config.pool.maxConnections).to.equal(5)
+        }
+
+        Object.keys(this.sequelize.config.pool || {}).forEach(function(key) {
+          expect(connectorManager.config.pool[key]).to.equal(self.sequelize.config.pool[key])
+        })
+      })
+    })
+
+    describe('if the passed uuid is not equal to "default"', function() {
+      it('uses the non-default connector', function() {
+        var connectorManager = this.transactionManager.getConnectorManager('a-uuid')
+        expect(connectorManager.config.uuid).to.equal('a-uuid')
+      })
+
+      it('creates a new connector manager', function() {
+        this.transactionManager.getConnectorManager()
+        expect(Object.keys(this.transactionManager.connectorManagers).length).to.equal(1)
+        this.transactionManager.getConnectorManager('a-uuid')
+        expect(Object.keys(this.transactionManager.connectorManagers).length).to.equal(2)
+        this.transactionManager.getConnectorManager('a-uuid')
+        expect(Object.keys(this.transactionManager.connectorManagers).length).to.equal(2)
+      })
+
+      it('treats the connector managers as singleton', function() {
+        var connectorManager1 = this.transactionManager.getConnectorManager('a-uuid')
+          , connectorManager2 = this.transactionManager.getConnectorManager('a-uuid')
+
+        expect(connectorManager1).to.equal(connectorManager2)
+      })
+
+      it('uses the pooling configuration of sequelize but with disabled replication and forced to one connection', function() {
+        var connectorManager = this.transactionManager.getConnectorManager('a-uuid')
+          , self             = this
+
+        if (Support.getTestDialect() !== 'sqlite') {
+          expect(this.sequelize.config.pool.maxConnections).to.equal(5)
+        }
+
+        Object.keys(this.sequelize.config.pool || {}).forEach(function(key) {
+          if (key !== 'maxConnections') {
+            expect(connectorManager.config.pool[key]).to.equal(self.sequelize.config.pool[key])
+          }
+        })
+
+        expect(connectorManager.config.pool.maxConnections).to.equal(0)
+      })
+    })
+  })
+})