constrain min to <= max

calvium · Feb 17, 2015 · 3ff0a61 · 3ff0a61
1 parent f3f67ac
commit 3ff0a61
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 2 deletions.
diff --git a/lib/connection-pool.js b/lib/connection-pool.js
@@ -19,7 +19,7 @@ function ConnectionPool(poolConfig, connectionConfig) {
 
     this.max = poolConfig.max || 50;
 
-    this.min = poolConfig.min >= 0 ? poolConfig.min : 10;
+    this.min = Math.min(this.max, poolConfig.min >= 0 ? poolConfig.min : 10);
 
     this.idleTimeout = !poolConfig.idleTimeout && poolConfig.idleTimeout !== false
         ? 300000 //5 min
@@ -301,4 +301,4 @@ ConnectionPool.prototype.drain = function (callback) {
     this.connections = null;
 };
 
-module.exports = ConnectionPool;
+module.exports = ConnectionPool;
diff --git a/test/connection-pool.test.js b/test/connection-pool.test.js
@@ -116,6 +116,70 @@ describe('ConnectionPool', function () {
         }
     });
 
+    it('min<=max, min specified > max specified', function (done) {
+        this.timeout(10000);
+
+        var poolConfig = { min: 5, max: 1, idleTimeout: 10};
+        var pool = new ConnectionPool(poolConfig, connectionConfig);
+
+        setTimeout(function() {
+            assert.equal(pool.connections.length, 1);
+        }, 4);
+
+        setTimeout(function() {
+            pool.acquire(function(err, connection) {
+                assert(!err);
+
+                var request = new Request('select 42', function (err, rowCount) {
+                    assert.strictEqual(rowCount, 1);
+                    connection.release();
+                    setTimeout(function () {
+                        assert.equal(pool.connections.length, 0);
+                        pool.drain(done);
+                    }, 200);
+                });
+
+                request.on('row', function (columns) {
+                    assert.strictEqual(columns[0].value, 42);
+                });
+
+                connection.execSql(request);
+            });
+        }, 2000);
+    });
+
+    it('min<=max, no min specified', function (done) {
+        this.timeout(10000);
+
+        var poolConfig = {max: 1, idleTimeout: 10};
+        var pool = new ConnectionPool(poolConfig, connectionConfig);
+
+        setTimeout(function() {
+            assert.equal(pool.connections.length, 1);
+        }, 4);
+
+        setTimeout(function() {
+            pool.acquire(function(err, connection) {
+                assert(!err);
+
+                var request = new Request('select 42', function (err, rowCount) {
+                    assert.strictEqual(rowCount, 1);
+                    connection.release();
+                    setTimeout(function () {
+                        assert.equal(pool.connections.length, 0);
+                        pool.drain(done);
+                    }, 200);
+                });
+
+                request.on('row', function (columns) {
+                    assert.strictEqual(columns[0].value, 42);
+                });
+
+                connection.execSql(request);
+            });
+        }, 2000);
+    });
+
     it('pool error event', function (done) {
         var poolConfig = {min: 2, max: 5};
         var pool = new ConnectionPool(poolConfig, {});