Renamed some stuff and made the connection information visible from the SQLHelper class.

James Craig · James Craig · commit 958ae8d5d92a · 2017-05-19T15:33:03.000-04:00
diff --git a/src/SQLHelper.DB/HelperClasses/Batch.cs b/src/SQLHelper.DB/HelperClasses/Batch.cs
@@ -38,7 +38,7 @@ public class Batch : IBatch
         /// Constructor
         /// </summary>
         /// <param name="source">Source info</param>
-        public Batch(ISource source)
+        public Batch(IConnection source)
         {
             Commands = new List<ICommand>();
             Source = source;
@@ -62,7 +62,7 @@ public Batch(ISource source)
         /// <summary>
         /// Connection string
         /// </summary>
-        protected ISource Source { get; set; }
+        protected IConnection Source { get; set; }
 
         /// <summary>
         /// Adds a command to be batched
@@ -283,7 +283,7 @@ private IList<IList<dynamic>> ExecuteCommands()
             var Factory = Source.Factory;
             using (DbConnection Connection = Factory.CreateConnection())
             {
-                Connection.ConnectionString = Source.Connection;
+                Connection.ConnectionString = Source.ConnectionString;
                 using (DbCommand ExecutableCommand = Factory.CreateCommand())
                 {
                     SetupCommand(Connection, ExecutableCommand);
@@ -332,7 +332,7 @@ private async Task<IList<IList<dynamic>>> ExecuteCommandsAsync()
             var Factory = Source.Factory;
             using (DbConnection Connection = Factory.CreateConnection())
             {
-                Connection.ConnectionString = Source.Connection;
+                Connection.ConnectionString = Source.ConnectionString;
                 using (DbCommand ExecutableCommand = Factory.CreateCommand())
                 {
                     SetupCommand(Connection, ExecutableCommand);
@@ -376,9 +376,9 @@ private void FinalizeCommands(List<IList<dynamic>> ReturnValue)
             }
         }
 
-        private void SetupCommand(DbConnection Connection, DbCommand ExecutableCommand)
+        private void SetupCommand(DbConnection DatabaseConnection, DbCommand ExecutableCommand)
         {
-            ExecutableCommand.Connection = Connection;
+            ExecutableCommand.Connection = DatabaseConnection;
             ExecutableCommand.CommandType = CommandType.Text;
             if (CheckTransaction())
                 ExecutableCommand.BeginTransaction();
diff --git a/src/SQLHelper.DB/HelperClasses/Connection.cs b/src/SQLHelper.DB/HelperClasses/Connection.cs
@@ -24,8 +24,8 @@ namespace SQLHelper.HelperClasses
     /// <summary>
     /// Data source class
     /// </summary>
-    /// <seealso cref="ISource"/>
-    public class Source : ISource
+    /// <seealso cref="IConnection"/>
+    public class Connection : IConnection
     {
         /// <summary>
         /// Constructor
@@ -36,7 +36,7 @@ public class Source : ISource
         /// <param name="name">The name.</param>
         /// <param name="sourceType">Type of the source.</param>
         /// <param name="parameterPrefix">The parameter prefix.</param>
-        public Source(IConfiguration configuration, DbProviderFactory factory, string connection, string name, string sourceType = "System.Data.SqlClient",
+        public Connection(IConfiguration configuration, DbProviderFactory factory, string connection, string name, string sourceType = "System.Data.SqlClient",
                         string parameterPrefix = "@")
         {
             Name = string.IsNullOrEmpty(name) ? "Default" : name;
@@ -45,11 +45,11 @@ public Source(IConfiguration configuration, DbProviderFactory factory, string co
             var TempConfig = configuration.GetConnectionString(Name);
             if (string.IsNullOrEmpty(connection) && TempConfig != null)
             {
-                Connection = TempConfig;
+                ConnectionString = TempConfig;
             }
             else
             {
-                Connection = string.IsNullOrEmpty(connection) ? name : connection;
+                ConnectionString = string.IsNullOrEmpty(connection) ? name : connection;
             }
             if (string.IsNullOrEmpty(parameterPrefix))
             {
@@ -59,7 +59,7 @@ public Source(IConfiguration configuration, DbProviderFactory factory, string co
                     ParameterPrefix = ":";
                 else
                 {
-                    DatabaseName = Regex.Match(Connection, @"Initial Catalog=([^;]*)").Groups[1].Value;
+                    DatabaseName = Regex.Match(ConnectionString, @"Initial Catalog=([^;]*)").Groups[1].Value;
                     ParameterPrefix = "@";
                 }
             }
@@ -68,15 +68,15 @@ public Source(IConfiguration configuration, DbProviderFactory factory, string co
                 ParameterPrefix = parameterPrefix;
                 if (sourceType.Contains("SqlClient"))
                 {
-                    DatabaseName = Regex.Match(Connection, @"Initial Catalog=([^;]*)").Groups[1].Value;
+                    DatabaseName = Regex.Match(ConnectionString, @"Initial Catalog=([^;]*)").Groups[1].Value;
                 }
             }
         }
 
         /// <summary>
         /// Connection string
         /// </summary>
-        public string Connection { get; protected set; }
+        public string ConnectionString { get; protected set; }
 
         /// <summary>
         /// Gets the database.
diff --git a/src/SQLHelper.DB/HelperClasses/Interfaces/IConnection.cs b/src/SQLHelper.DB/HelperClasses/Interfaces/IConnection.cs
@@ -21,13 +21,13 @@ namespace SQLHelper.HelperClasses.Interfaces
     /// <summary>
     /// Data source interface
     /// </summary>
-    public interface ISource
+    public interface IConnection
     {
         /// <summary>
         /// Connection string
         /// </summary>
         /// <value>The connection.</value>
-        string Connection { get; }
+        string ConnectionString { get; }
 
         /// <summary>
         /// Gets the database.
diff --git a/src/SQLHelper.DB/SQLHelper.cs b/src/SQLHelper.DB/SQLHelper.cs
@@ -40,8 +40,8 @@ public class SQLHelper
         /// <param name="database">The database.</param>
         public SQLHelper(IConfiguration configuration, DbProviderFactory factory, string database = "Default")
         {
-            DatabaseSource = new Source(configuration, factory, "", database);
-            Batch = new Batch(DatabaseSource);
+            DatabaseConnection = new Connection(configuration, factory, "", database);
+            Batch = new Batch(DatabaseConnection);
         }
 
         /// <summary>
@@ -51,16 +51,16 @@ public SQLHelper(IConfiguration configuration, DbProviderFactory factory, string
         public int Count { get { return Batch.CommandCount; } }
 
         /// <summary>
-        /// Gets the batch.
+        /// Gets or sets the source.
         /// </summary>
-        /// <value>The batch.</value>
-        protected IBatch Batch { get; private set; }
+        /// <value>The source.</value>
+        public IConnection DatabaseConnection { get; private set; }
 
         /// <summary>
-        /// Gets or sets the source.
+        /// Gets the batch.
         /// </summary>
-        /// <value>The source.</value>
-        protected ISource DatabaseSource { get; private set; }
+        /// <value>The batch.</value>
+        protected IBatch Batch { get; private set; }
 
         /// <summary>
         /// Adds a command.
@@ -135,7 +135,7 @@ public SQLHelper AddQuery(SQLHelper helper)
         /// <returns>This</returns>
         public SQLHelper CreateBatch()
         {
-            Batch = new Batch(DatabaseSource);
+            Batch = new Batch(DatabaseConnection);
             return this;
         }
 
diff --git a/test/SQLHelper.Tests/HelperClasses/BatchTests.cs b/test/SQLHelper.Tests/HelperClasses/BatchTests.cs
@@ -15,7 +15,7 @@ public void AddQuery()
             var Configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection()
                 .Build();
-            var Instance = new Batch(new Source(Configuration,
+            var Instance = new Batch(new Connection(Configuration,
                     SqlClientFactory.Instance,
                     "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false",
                     "DATABASE NAME")
@@ -31,7 +31,7 @@ public void AddQuerys()
             var Configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection()
                 .Build();
-            var Instance = new Batch(new Source(Configuration,
+            var Instance = new Batch(new Connection(Configuration,
                     SqlClientFactory.Instance,
                     "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false",
                     "DATABASE NAME")
@@ -48,7 +48,7 @@ public void AddQuerysWithParameters()
             var Configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection()
                 .Build();
-            var Instance = new Batch(new Source(Configuration,
+            var Instance = new Batch(new Connection(Configuration,
                     SqlClientFactory.Instance,
                     "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false",
                     "DATABASE NAME")
@@ -65,7 +65,7 @@ public void AddQueryWithParameters()
             var Configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection()
                 .Build();
-            var Instance = new Batch(new Source(Configuration,
+            var Instance = new Batch(new Connection(Configuration,
                     SqlClientFactory.Instance,
                     "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false",
                     "DATABASE NAME")
@@ -81,7 +81,7 @@ public void Creation()
             var Configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection()
                 .Build();
-            var Instance = new Batch(new Source(Configuration,
+            var Instance = new Batch(new Connection(Configuration,
                     SqlClientFactory.Instance,
                     "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false",
                     "DATABASE NAME")
diff --git a/test/SQLHelper.Tests/HelperClasses/SourceTests.cs b/test/SQLHelper.Tests/HelperClasses/SourceTests.cs
@@ -14,8 +14,8 @@ public void Create()
             var Configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection()
                 .Build();
-            var TestItem = new Source(Configuration, SqlClientFactory.Instance, "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false", "DATABASE NAME");
-            Assert.Equal("Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false", TestItem.Connection);
+            var TestItem = new Connection(Configuration, SqlClientFactory.Instance, "Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false", "DATABASE NAME");
+            Assert.Equal("Data Source=localhost;Initial Catalog=TestDatabase;Integrated Security=SSPI;Pooling=false", TestItem.ConnectionString);
             Assert.Equal("TestDatabase", TestItem.DatabaseName);
             Assert.Equal(SqlClientFactory.Instance, TestItem.Factory);
             Assert.Equal("DATABASE NAME", TestItem.Name);

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class Batch : IBatch`
`38`	`38`	`/// Constructor`
`39`	`39`	`/// </summary>`
`40`	`40`	`/// <param name="source">Source info</param>`
`41`		`- public Batch(ISource source)`
	`41`	`+ public Batch(IConnection source)`
`42`	`42`	`{`
`43`	`43`	`Commands = new List<ICommand>();`
`44`	`44`	`Source = source;`
`@@ -62,7 +62,7 @@ public Batch(ISource source)`
`62`	`62`	`/// <summary>`
`63`	`63`	`/// Connection string`
`64`	`64`	`/// </summary>`
`65`		`- protected ISource Source { get; set; }`
	`65`	`+ protected IConnection Source { get; set; }`
`66`	`66`
`67`	`67`	`/// <summary>`
`68`	`68`	`/// Adds a command to be batched`
`@@ -283,7 +283,7 @@ private IList<IList<dynamic>> ExecuteCommands()`
`283`	`283`	`var Factory = Source.Factory;`
`284`	`284`	`using (DbConnection Connection = Factory.CreateConnection())`
`285`	`285`	`{`
`286`		`- Connection.ConnectionString = Source.Connection;`
	`286`	`+ Connection.ConnectionString = Source.ConnectionString;`
`287`	`287`	`using (DbCommand ExecutableCommand = Factory.CreateCommand())`
`288`	`288`	`{`
`289`	`289`	`SetupCommand(Connection, ExecutableCommand);`
`@@ -332,7 +332,7 @@ private async Task<IList<IList<dynamic>>> ExecuteCommandsAsync()`
`332`	`332`	`var Factory = Source.Factory;`
`333`	`333`	`using (DbConnection Connection = Factory.CreateConnection())`
`334`	`334`	`{`
`335`		`- Connection.ConnectionString = Source.Connection;`
	`335`	`+ Connection.ConnectionString = Source.ConnectionString;`
`336`	`336`	`using (DbCommand ExecutableCommand = Factory.CreateCommand())`
`337`	`337`	`{`
`338`	`338`	`SetupCommand(Connection, ExecutableCommand);`
`@@ -376,9 +376,9 @@ private void FinalizeCommands(List<IList<dynamic>> ReturnValue)`
`376`	`376`	`}`
`377`	`377`	`}`
`378`	`378`
`379`		`- private void SetupCommand(DbConnection Connection, DbCommand ExecutableCommand)`
	`379`	`+ private void SetupCommand(DbConnection DatabaseConnection, DbCommand ExecutableCommand)`
`380`	`380`	`{`
`381`		`- ExecutableCommand.Connection = Connection;`
	`381`	`+ ExecutableCommand.Connection = DatabaseConnection;`
`382`	`382`	`ExecutableCommand.CommandType = CommandType.Text;`
`383`	`383`	`if (CheckTransaction())`
`384`	`384`	`ExecutableCommand.BeginTransaction();`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ namespace SQLHelper.HelperClasses`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// Data source class`
`26`	`26`	`/// </summary>`
`27`		`- /// <seealso cref="ISource"/>`
`28`		`- public class Source : ISource`
	`27`	`+ /// <seealso cref="IConnection"/>`
	`28`	`+ public class Connection : IConnection`
`29`	`29`	`{`
`30`	`30`	`/// <summary>`
`31`	`31`	`/// Constructor`
`@@ -36,7 +36,7 @@ public class Source : ISource`
`36`	`36`	`/// <param name="name">The name.</param>`
`37`	`37`	`/// <param name="sourceType">Type of the source.</param>`
`38`	`38`	`/// <param name="parameterPrefix">The parameter prefix.</param>`
`39`		`- public Source(IConfiguration configuration, DbProviderFactory factory, string connection, string name, string sourceType = "System.Data.SqlClient",`
	`39`	`+ public Connection(IConfiguration configuration, DbProviderFactory factory, string connection, string name, string sourceType = "System.Data.SqlClient",`
`40`	`40`	`string parameterPrefix = "@")`
`41`	`41`	`{`
`42`	`42`	`Name = string.IsNullOrEmpty(name) ? "Default" : name;`
`@@ -45,11 +45,11 @@ public Source(IConfiguration configuration, DbProviderFactory factory, string co`
`45`	`45`	`var TempConfig = configuration.GetConnectionString(Name);`
`46`	`46`	`if (string.IsNullOrEmpty(connection) && TempConfig != null)`
`47`	`47`	`{`
`48`		`- Connection = TempConfig;`
	`48`	`+ ConnectionString = TempConfig;`
`49`	`49`	`}`
`50`	`50`	`else`
`51`	`51`	`{`
`52`		`- Connection = string.IsNullOrEmpty(connection) ? name : connection;`
	`52`	`+ ConnectionString = string.IsNullOrEmpty(connection) ? name : connection;`
`53`	`53`	`}`
`54`	`54`	`if (string.IsNullOrEmpty(parameterPrefix))`
`55`	`55`	`{`
`@@ -59,7 +59,7 @@ public Source(IConfiguration configuration, DbProviderFactory factory, string co`
`59`	`59`	`ParameterPrefix = ":";`
`60`	`60`	`else`
`61`	`61`	`{`
`62`		`- DatabaseName = Regex.Match(Connection, @"Initial Catalog=([^;]*)").Groups[1].Value;`
	`62`	`+ DatabaseName = Regex.Match(ConnectionString, @"Initial Catalog=([^;]*)").Groups[1].Value;`
`63`	`63`	`ParameterPrefix = "@";`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -68,15 +68,15 @@ public Source(IConfiguration configuration, DbProviderFactory factory, string co`
`68`	`68`	`ParameterPrefix = parameterPrefix;`
`69`	`69`	`if (sourceType.Contains("SqlClient"))`
`70`	`70`	`{`
`71`		`- DatabaseName = Regex.Match(Connection, @"Initial Catalog=([^;]*)").Groups[1].Value;`
	`71`	`+ DatabaseName = Regex.Match(ConnectionString, @"Initial Catalog=([^;]*)").Groups[1].Value;`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/// <summary>`
`77`	`77`	`/// Connection string`
`78`	`78`	`/// </summary>`
`79`		`- public string Connection { get; protected set; }`
	`79`	`+ public string ConnectionString { get; protected set; }`
`80`	`80`
`81`	`81`	`/// <summary>`
`82`	`82`	`/// Gets the database.`