using 'database' option replace 'db'

lib/adapters/redis.js

@@ -1,18 +1,31 @@
 var redis = require('redis');
 var _ = require('lodash');
 
+var defaultPacker = {
+    pack: function (target) { return JSON.stringify(target); },
+    unpack: function (target) { return JSON.parse(target); }
+};
+
 exports.initialize = function initializeRedis(store, callback) {
     var settings = store.settings || {};
-    var client, packer;
-    if (settings instanceof redis.RedisClient) client = settings;
-    else {
-        if (settings.client instanceof redis.RedisClient) client = settings.client;
-        else client = redis.createClient(settings.port, settings.host, settings);
-        if ('db' in settings) client.select(settings['db']);
-        packer = settings.packer || {
-            pack: function (target) { return JSON.stringify(target); },
-            unpack: function (target) { return JSON.parse(target); }
-        };
+    var client, packer = defaultPacker;
+    if (settings instanceof redis.RedisClient) {
+        client = settings;
+        process.nextTick(done);
+    } else {
+        if (settings.client instanceof redis.RedisClient) {
+            client = settings.client;
+        } else {
+            client = redis.createClient(settings.port, settings.host, settings);
+            client.on('connect', function () {
+                if (settings.database) {
+                    client.select(settings.database, done);
+                }
+            });
+
+        }
+
+        if (settings.packer) packer = settings.packer;
 
     }
 
@@ -22,7 +35,11 @@ exports.initialize = function initializeRedis(store, callback) {
             return new Redis(client, packer, options);
         }
     };
-    process.nextTick(callback);
+
+    function done() {
+        if (callback) callback();
+    }
+
 };
 
 function Redis(client, packer, options) {