Move db selection to the pool and default to 0 (#51)

Author: PuKoren

index.js

@@ -26,6 +26,7 @@ function redisStore(args) {
 
   redisOptions.host = redisOptions.host || '127.0.0.1';
   redisOptions.port = redisOptions.port || 6379;
+  redisOptions.db = redisOptions.db || 0;
 
   var pool = new RedisPool(redisOptions, poolSettings);
 
@@ -39,19 +40,7 @@ function redisStore(args) {
    * @param {Function} cb - A callback that returns
    */
   function connect(cb) {
-    pool.acquire(function(err, conn) {
-      if (err) {
-        pool.release(conn);
-        return cb(err);
-      }
-
-      /* istanbul ignore else */
-      if (args.db || args.db === 0) {
-        conn.select(args.db);
-      }
-
-      cb(null, conn);
-    });
+    pool.acquireDb(cb, redisOptions.db);
   }
 
   /**

test/lib/redis-store-spec.js

@@ -189,10 +189,10 @@ describe('get', function () {
 
   it('should return an error if there is an error acquiring a connection', function (done) {
     var pool = redisCache.store._pool;
-    sinon.stub(pool, 'acquire').yieldsAsync('Something unexpected');
+    sinon.stub(pool, 'acquireDb').yieldsAsync('Something unexpected');
     sinon.stub(pool, 'release');
     redisCache.get('foo', function (err) {
-      pool.acquire.restore();
+      pool.acquireDb.restore();
       pool.release.restore();
       assert.notEqual(err, null);
       done();
@@ -219,11 +219,11 @@ describe('del', function () {
 
   it('should return an error if there is an error acquiring a connection', function (done) {
     var pool = redisCache.store._pool;
-    sinon.stub(pool, 'acquire').yieldsAsync('Something unexpected');
+    sinon.stub(pool, 'acquireDb').yieldsAsync('Something unexpected');
     sinon.stub(pool, 'release');
     redisCache.set('foo', 'bar', function () {
       redisCache.del('foo', function (err) {
-        pool.acquire.restore();
+        pool.acquireDb.restore();
         pool.release.restore();
         assert.notEqual(err, null);
         done();
@@ -247,10 +247,10 @@ describe('reset', function () {
 
   it('should return an error if there is an error acquiring a connection', function (done) {
     var pool = redisCache.store._pool;
-    sinon.stub(pool, 'acquire').yieldsAsync('Something unexpected');
+    sinon.stub(pool, 'acquireDb').yieldsAsync('Something unexpected');
     sinon.stub(pool, 'release');
     redisCache.reset(function (err) {
-      pool.acquire.restore();
+      pool.acquireDb.restore();
       pool.release.restore();
       assert.notEqual(err, null);
       done();
@@ -279,11 +279,11 @@ describe('ttl', function () {
 
   it('should return an error if there is an error acquiring a connection', function (done) {
     var pool = redisCache.store._pool;
-    sinon.stub(pool, 'acquire').yieldsAsync('Something unexpected');
+    sinon.stub(pool, 'acquireDb').yieldsAsync('Something unexpected');
     sinon.stub(pool, 'release');
     redisCache.set('foo', 'bar', function () {
       redisCache.ttl('foo', function (err) {
-        pool.acquire.restore();
+        pool.acquireDb.restore();
         pool.release.restore();
         assert.notEqual(err, null);
         done();
@@ -317,11 +317,11 @@ describe('keys', function () {
 
   it('should return an error if there is an error acquiring a connection', function (done) {
     var pool = redisCache.store._pool;
-    sinon.stub(pool, 'acquire').yieldsAsync('Something unexpected');
+    sinon.stub(pool, 'acquireDb').yieldsAsync('Something unexpected');
     sinon.stub(pool, 'release');
     redisCache.set('foo', 'bar', function () {
       redisCache.keys('f*', function (err) {
-        pool.acquire.restore();
+        pool.acquireDb.restore();
         pool.release.restore();
         assert.notEqual(err, null);
         done();
@@ -368,10 +368,10 @@ describe('getClient', function () {
 
   it('should return an error if there is an error acquiring a connection', function (done) {
     var pool = redisCache.store._pool;
-    sinon.stub(pool, 'acquire').yieldsAsync('Something unexpected');
+    sinon.stub(pool, 'acquireDb').yieldsAsync('Something unexpected');
     sinon.stub(pool, 'release');
     redisCache.store.getClient(function (err) {
-      pool.acquire.restore();
+      pool.acquireDb.restore();
       pool.release.restore();
       assert.notEqual(err, null);
       done();