- get/contains using name

#6

Author: eben-roux

Shuttle.Core.Data/.build/package.nuspec

@@ -5,7 +5,7 @@
     <version>{semver}</version>
     <authors>Eben Roux</authors>
     <owners>Eben Roux</owners>
-    <licenseUrl>https://github.com/shuttle/Shuttle.Core.Data/raw/master/LICENSE</licenseUrl>
+    <license type="expression">BSD-3-Clause</license>
     <projectUrl>https://github.com/shuttle/Shuttle.Core.Data</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/Shuttle/Shuttle.Core.Data/master/.media/logo.png</iconUrl>
     <repository type="git" url="https://github.com/Shuttle/Shuttle.Core.Data.git" />

Shuttle.Core.Data/DatabaseContextCache.cs

@@ -37,12 +37,29 @@ public ActiveDatabaseContext Use(IDatabaseContext context)
 		    return new ActiveDatabaseContext(this, current);
         }
 
-		public bool Contains(string connectionString)
+		public bool Contains(string name)
 		{
-			return DatabaseContexts.Find(candidate => candidate.Connection.ConnectionString.Equals(connectionString, StringComparison.OrdinalIgnoreCase)) != null;
+			return DatabaseContexts.Find(candidate => candidate.Name.Equals(name, StringComparison.OrdinalIgnoreCase)) != null;
 		}
 
-		public void Add(IDatabaseContext context)
+        public bool ContainsConnectionString(string connectionString)
+        {
+            return DatabaseContexts.Find(candidate => candidate.Connection.ConnectionString.Equals(connectionString, StringComparison.OrdinalIgnoreCase)) != null;
+        }
+
+        public IDatabaseContext GetConnectionString(string connectionString)
+        {
+            var result = DatabaseContexts.Find(candidate => candidate.Connection.ConnectionString.Equals(connectionString, StringComparison.OrdinalIgnoreCase));
+
+            if (result == null)
+            {
+                throw new Exception(string.Format(Resources.DatabaseContextConnectionStringNotFoundException, connectionString));
+            }
+
+            return result;
+        }
+
+        public void Add(IDatabaseContext context)
 		{
 			if (Find(context) != null)
 			{
@@ -75,13 +92,13 @@ public void Remove(IDatabaseContext context)
 			DatabaseContexts.Remove(candidate);
 		}
 
-		public IDatabaseContext Get(string connectionString)
+		public IDatabaseContext Get(string name)
 		{
-			var result = DatabaseContexts.Find(candidate => candidate.Connection.ConnectionString.Equals(connectionString, StringComparison.OrdinalIgnoreCase));
+			var result = DatabaseContexts.Find(candidate => candidate.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
 
 			if (result == null)
 			{
-				throw new Exception(string.Format(Resources.DatabaseContextConnectionStringNotFoundException, DbConnectionExtensions.SecuredConnectionString(connectionString)));
+				throw new Exception(string.Format(Resources.DatabaseContextNameNotFoundException, name));
 			}
 
 			return result;

Shuttle.Core.Data/DatabaseContextFactory.cs

@@ -43,8 +43,8 @@ public IDatabaseContext Create(string name)
 
         public IDatabaseContext Create(string providerName, string connectionString)
         {
-            return DatabaseContextCache.Contains(connectionString)
-                ? DatabaseContextCache.Get(connectionString).Suppressed()
+            return DatabaseContextCache.ContainsConnectionString(connectionString)
+                ? DatabaseContextCache.GetConnectionString(connectionString).Suppressed()
                 : new DatabaseContext(providerName,
                     DbConnectionFactory.CreateConnection(providerName, connectionString),
                     DbCommandFactory);
@@ -54,8 +54,8 @@ public IDatabaseContext Create(string providerName, IDbConnection dbConnection)
         {
             Guard.AgainstNull(dbConnection, nameof(dbConnection));
 
-            return DatabaseContextCache.Contains(dbConnection.ConnectionString)
-                ? DatabaseContextCache.Get(dbConnection.ConnectionString).Suppressed()
+            return DatabaseContextCache.ContainsConnectionString(dbConnection.ConnectionString)
+                ? DatabaseContextCache.GetConnectionString(dbConnection.ConnectionString).Suppressed()
                 : new DatabaseContext(providerName, dbConnection, DbCommandFactory);
         }
 

Shuttle.Core.Data/IDatabaseContextCache.cs

@@ -5,9 +5,11 @@ public interface IDatabaseContextCache
 		IDatabaseContext Current { get; }
 		ActiveDatabaseContext Use(string name);
 		ActiveDatabaseContext Use(IDatabaseContext context);
-		bool Contains(string connectionString);
+        bool Contains(string name);
+        bool ContainsConnectionString(string connectionString);
+        IDatabaseContext Get(string name);
+        IDatabaseContext GetConnectionString(string connectionString);
 		void Add(IDatabaseContext context);
 		void Remove(IDatabaseContext context);
-		IDatabaseContext Get(string connectionString);
 	}
 }

Shuttle.Core.Data/Properties/AssemblyInfo.cs

@@ -33,10 +33,10 @@
 [assembly: AssemblyTitle(".NET Standard 2.0")]
 #endif
 
-[assembly: AssemblyVersion("10.0.10.0")]
+[assembly: AssemblyVersion("11.0.0.0")]
 [assembly: AssemblyCopyright("Copyright © Eben Roux 2017")]
 [assembly: AssemblyProduct("Shuttle.Core.Data")]
 [assembly: AssemblyCompany("Shuttle")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyInformationalVersion("10.0.10")]
+[assembly: AssemblyInformationalVersion("11.0.0")]
 [assembly: ComVisible(false)]

Shuttle.Core.Data/RecordNotFoundException.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace Shuttle.Core.Data
+{
+    public class RecordNotFoundException : Exception
+    {
+        public RecordNotFoundException(string message) : base(message)
+        {
+        }
+
+        public static RecordNotFoundException For(string name, object id)
+        {
+            return new RecordNotFoundException(
+                $"Could not find a record for '{name}' with id '{id ?? "(null)"}'.");
+        }
+
+        public static RecordNotFoundException For<T>(object id)
+        {
+            return For(typeof(T).Name, id);
+        }
+    }
+}

Shuttle.Core.Data/ThreadStaticDatabaseContextCache.cs

@@ -18,12 +18,22 @@ public ActiveDatabaseContext Use(IDatabaseContext context)
 			return GuardedCache().Use(context);
 		}
 
-		public bool Contains(string connectionString)
+		public bool Contains(string name)
 		{
-			return GuardedCache().Contains(connectionString);
+			return GuardedCache().Contains(name);
 		}
 
-		public void Add(IDatabaseContext context)
+        public bool ContainsConnectionString(string connectionString)
+        {
+            return GuardedCache().ContainsConnectionString(connectionString);
+        }
+
+        public IDatabaseContext GetConnectionString(string connectionString)
+        {
+            return GuardedCache().GetConnectionString(connectionString);
+        }
+
+        public void Add(IDatabaseContext context)
 		{
 			GuardedCache().Add(context);
 		}
@@ -33,9 +43,9 @@ public void Remove(IDatabaseContext context)
 			GuardedCache().Remove(context);
 		}
 
-		public IDatabaseContext Get(string connectionString)
+		public IDatabaseContext Get(string name)
 		{
-			return GuardedCache().Get(connectionString);
+			return GuardedCache().Get(name);
 		}
 
 		private static DatabaseContextCache GuardedCache()