Change the default Db to long? to avoid overriding db setting on connection string

Author: mythz

src/ServiceStack.Redis/BasicRedisClientManager.cs

@@ -41,7 +41,7 @@ public partial class BasicRedisClientManager
 
         public IRedisClientFactory RedisClientFactory { get; set; }
 
-        public long Db { get; private set; }
+        public long? Db { get; private set; }
 
         public Action<IRedisNativeClient> ConnectionFilter { get; set; }
 
@@ -65,14 +65,14 @@ public BasicRedisClientManager(int initialDb, params string[] readWriteHosts)
         public BasicRedisClientManager(
             IEnumerable<string> readWriteHosts,
             IEnumerable<string> readOnlyHosts)
-            : this(readWriteHosts, readOnlyHosts, RedisNativeClient.DefaultDb)
+            : this(readWriteHosts, readOnlyHosts, null)
         {
         }
 
         public BasicRedisClientManager(
             IEnumerable<string> readWriteHosts,
             IEnumerable<string> readOnlyHosts,
-            long initalDb)
+            long? initalDb)
         {
             this.Db = initalDb;
 
@@ -127,8 +127,8 @@ private RedisClient InitNewClient(RedisEndpoint nextHost)
                 client.IdleTimeOutSecs = this.IdleTimeOutSecs.Value;
             if (this.NamespacePrefix != null)
                 client.NamespacePrefix = NamespacePrefix;
-            if (client.Db != Db) //Reset database to default if changed
-                client.ChangeDb(Db);
+            if (Db != null && client.Db != Db) //Reset database to default if changed
+                client.ChangeDb(Db.Value);
 
             return client;
         }

src/ServiceStack.Redis/PooledRedisClientManager.cs

@@ -60,14 +60,14 @@ public partial class PooledRedisClientManager
 
         public IRedisClientFactory RedisClientFactory { get; set; }
 
-        public long Db { get; private set; }
+        public long? Db { get; private set; }
 
         public Action<IRedisNativeClient> ConnectionFilter { get; set; }
 
         public PooledRedisClientManager() : this(RedisNativeClient.DefaultHost) { }
 
         public PooledRedisClientManager(int poolSize, int poolTimeOutSeconds, params string[] readWriteHosts)
-            : this(readWriteHosts, readWriteHosts, null, RedisNativeClient.DefaultDb, poolSize, poolTimeOutSeconds)
+            : this(readWriteHosts, readWriteHosts, null, null, poolSize, poolTimeOutSeconds)
         {
         }
 
@@ -96,7 +96,7 @@ public PooledRedisClientManager(
             IEnumerable<string> readWriteHosts,
             IEnumerable<string> readOnlyHosts,
             RedisClientManagerConfig config)
-            : this(readWriteHosts, readOnlyHosts, config, RedisNativeClient.DefaultDb, null, null)
+            : this(readWriteHosts, readOnlyHosts, config, null, null, null)
         {
         }
 
@@ -112,12 +112,12 @@ public PooledRedisClientManager(
             IEnumerable<string> readWriteHosts,
             IEnumerable<string> readOnlyHosts,
             RedisClientManagerConfig config,
-            long initalDb,
+            long? initalDb,
             int? poolSizeMultiplier,
             int? poolTimeOutSeconds)
         {
             this.Db = config != null
-                ? config.DefaultDb.GetValueOrDefault(initalDb)
+                ? config.DefaultDb ?? initalDb
                 : initalDb;
 
             ReadWriteHosts = readWriteHosts.ToRedisEndPoints();
@@ -281,8 +281,8 @@ private void InitClient(RedisClient client)
                 client.IdleTimeOutSecs = this.IdleTimeOutSecs.Value;
             if (this.NamespacePrefix != null)
                 client.NamespacePrefix = NamespacePrefix;
-            if (client.Db != Db) //Reset database to default if changed
-                client.ChangeDb(Db);
+            if (Db != null && client.Db != Db) //Reset database to default if changed
+                client.ChangeDb(Db.Value);
         }
 
         /// <summary>

tests/ServiceStack.Redis.Tests/Issues/RedisCharacterizationTests.cs

@@ -0,0 +1,75 @@
+using System;
+using NUnit.Framework;
+
+namespace ServiceStack.Redis.Tests.Issues
+{
+    public class RedisCharacterizationTests
+    {
+        private IRedisClientsManager _db1ClientManager;
+        private IRedisClientsManager _db2ClientManager;
+
+        [SetUp]
+        public void SetUp()
+        {
+            foreach (var clientManager in new[] { _db1ClientManager, _db2ClientManager })
+            {
+                if (clientManager != null)
+                {
+                    using (var cacheClient = clientManager.GetCacheClient())
+                    {
+                        cacheClient.Remove("key");
+                    }
+                }
+            }            
+        }
+
+        [Test]
+        public void BasicRedisClientManager_WhenUsingADatabaseOnARedisConnectionString_CorrectDatabaseIsUsed()
+        {
+            TestForDatabaseOnConnectionString(connectionString => new BasicRedisClientManager(connectionString));
+        }
+
+        [Test]
+        public void PooledRedisClientManager_WhenUsingADatabaseOnARedisConnectionString_CorrectDatabaseIsUsed()
+        {
+            TestForDatabaseOnConnectionString(connectionString => new PooledRedisClientManager(connectionString));
+        }
+
+        [Test]
+        public void RedisManagerPool_WhenUsingADatabaseOnARedisConnectionString_CorrectDatabaseIsUsed()
+        {
+            TestForDatabaseOnConnectionString(connectionString => new RedisManagerPool(connectionString));
+        }
+
+        private void TestForDatabaseOnConnectionString(Func<string, IRedisClientsManager> factory)
+        {
+            _db1ClientManager = factory("localhost?db=1");
+            _db2ClientManager = factory("localhost?db=2");
+
+            using (var cacheClient = _db1ClientManager.GetCacheClient())
+            {
+                cacheClient.Set("key", "value");
+            }
+            using (var cacheClient = _db2ClientManager.GetCacheClient())
+            {
+                Assert.Null(cacheClient.Get<string>("key"));
+            }
+        }
+
+        [Test]
+        public void WhenUsingAnInitialDatabase_CorrectDatabaseIsUsed()
+        {
+            _db1ClientManager = new BasicRedisClientManager(1, "localhost");
+            _db2ClientManager = new BasicRedisClientManager(2, "localhost");
+
+            using (var cacheClient = _db1ClientManager.GetCacheClient())
+            {
+                cacheClient.Set("key", "value");
+            }
+            using (var cacheClient = _db2ClientManager.GetCacheClient())
+            {
+                Assert.Null(cacheClient.Get<string>("key"));
+            }
+        }
+    }
+}

tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj

@@ -179,6 +179,7 @@
     <Compile Include="AdhocClientTests.cs" />
     <Compile Include="ConfigTests.cs" />
     <Compile Include="CustomCommandTests.cs" />
+    <Compile Include="Issues\RedisCharacterizationTests.cs" />
     <Compile Include="RedisManagerPoolTests.cs" />
     <Compile Include="DiagnosticTests.cs" />
     <Compile Include="Examples\ServiceStack_Redis_UseCase.cs" />