Updated dependencies.

Added the ability to specify retries when opening the connection.
Minor change in SQLHelper's constructor order.

Author: James Craig

src/SQLHelper.DB/ExtensionMethods/DbCommandExtensions.cs

@@ -136,12 +136,13 @@ public static DbCommand AddParameter(this DbCommand command, string id, DbType t
         /// Begins a transaction
         /// </summary>
         /// <param name="command">Command object</param>
+        /// <param name="retries">The retries.</param>
         /// <returns>A transaction object</returns>
-        public static DbTransaction BeginTransaction(this DbCommand command)
+        public static DbTransaction BeginTransaction(this DbCommand command, int retries = 0)
         {
             if (command == null || command.Connection == null)
                 return null;
-            command.Open();
+            command.Open(retries);
             command.Transaction = command.Connection.BeginTransaction();
             return command.Transaction;
         }
@@ -187,28 +188,32 @@ public static DbCommand Commit(this DbCommand command)
         /// <summary>
         /// Executes the stored procedure as a scalar query
         /// </summary>
+        /// <typeparam name="DataType">The type of the ata type.</typeparam>
         /// <param name="command">Command object</param>
         /// <param name="defaultValue">Default value if there is an issue</param>
+        /// <param name="retries">The retries.</param>
         /// <returns>The object of the first row and first column</returns>
-        public static DataType ExecuteScalar<DataType>(this DbCommand command, DataType defaultValue = default(DataType))
+        public static DataType ExecuteScalar<DataType>(this DbCommand command, DataType defaultValue = default(DataType), int retries = 0)
         {
             if (command == null)
                 return defaultValue;
-            command.Open();
+            command.Open(retries);
             return command.ExecuteScalar().To(defaultValue);
         }
 
         /// <summary>
         /// Executes the stored procedure as a scalar query async
         /// </summary>
+        /// <typeparam name="DataType">The type of the ata type.</typeparam>
         /// <param name="command">Command object</param>
         /// <param name="defaultValue">Default value if there is an issue</param>
+        /// <param name="retries">The retries.</param>
         /// <returns>The object of the first row and first column</returns>
-        public static async Task<DataType> ExecuteScalarAsync<DataType>(this DbCommand command, DataType defaultValue = default(DataType))
+        public static async Task<DataType> ExecuteScalarAsync<DataType>(this DbCommand command, DataType defaultValue = default(DataType), int retries = 0)
         {
             if (command == null)
                 return defaultValue;
-            command.Open();
+            command.Open(retries);
             var ReturnValue = await command.ExecuteScalarAsync();
             return ReturnValue.To(defaultValue);
         }
@@ -254,14 +259,28 @@ public static DbParameter GetOrCreateParameter(this DbCommand command, string id
         /// Opens the connection
         /// </summary>
         /// <param name="command">Command object</param>
+        /// <param name="retries">The retries.</param>
         /// <returns>The DBCommand object</returns>
-        public static DbCommand Open(this DbCommand command)
+        public static DbCommand Open(this DbCommand command, int retries = 0)
         {
-            if (command != null
-                && command.Connection != null
-                && command.Connection.State != ConnectionState.Open)
-                command.Connection.Open();
-            return command;
+            Exception holder = null;
+            while (retries >= 0)
+            {
+                try
+                {
+                    if (command != null
+                        && command.Connection != null
+                        && command.Connection.State != ConnectionState.Open)
+                        command.Connection.Open();
+                    return command;
+                }
+                catch (Exception e)
+                {
+                    holder = e;
+                }
+                --retries;
+            }
+            throw holder;
         }
 
         /// <summary>

src/SQLHelper.DB/HelperClasses/Batch.cs

@@ -314,7 +314,6 @@ private List<List<dynamic>> ExecuteCommands()
                 using (DbCommand ExecutableCommand = Factory.CreateCommand())
                 {
                     SetupCommand(Connection, ExecutableCommand);
-
                     try
                     {
                         int Count = 0;
@@ -417,8 +416,8 @@ private void SetupCommand(DbConnection DatabaseConnection, DbCommand ExecutableC
             ExecutableCommand.Connection = DatabaseConnection;
             ExecutableCommand.CommandType = CommandType.Text;
             if (CheckTransaction())
-                ExecutableCommand.BeginTransaction();
-            ExecutableCommand.Open();
+                ExecutableCommand.BeginTransaction(Source.Retries);
+            ExecutableCommand.Open(Source.Retries);
         }
 
         /// <summary>

src/SQLHelper.DB/HelperClasses/Connection.cs

@@ -46,9 +46,11 @@ public Connection(IConfiguration configuration, DbProviderFactory factory, strin
         /// <param name="connection">The connection.</param>
         /// <param name="name">The name.</param>
         /// <param name="parameterPrefix">The parameter prefix.</param>
+        /// <param name="retries">The retries.</param>
         /// <exception cref="System.ArgumentNullException">configuration</exception>
-        public Connection(IConfiguration configuration, DbProviderFactory factory, string connection, string name, string parameterPrefix = "@")
+        public Connection(IConfiguration configuration, DbProviderFactory factory, string connection, string name, string parameterPrefix = "@", int retries = 0)
         {
+            Retries = retries;
             Configuration = configuration ?? throw new System.ArgumentNullException(nameof(configuration));
             Name = string.IsNullOrEmpty(name) ? "Default" : name;
             SourceType = factory.GetType().FullName;
@@ -119,6 +121,12 @@ public Connection(IConfiguration configuration, DbProviderFactory factory, strin
         /// <value>The parameter prefix.</value>
         public string ParameterPrefix { get; protected set; }
 
+        /// <summary>
+        /// Gets the number of retries if unable to connect.
+        /// </summary>
+        /// <value>The number of retries if unable to connect.</value>
+        public int Retries { get; protected set; }
+
         /// <summary>
         /// Source type, based on ADO.Net provider name or identifier used by CUL
         /// </summary>

src/SQLHelper.DB/HelperClasses/Interfaces/IConnection.cs

@@ -60,6 +60,12 @@ public interface IConnection
         /// <value>The parameter prefix.</value>
         string ParameterPrefix { get; }
 
+        /// <summary>
+        /// Gets the number of retries if unable to connect.
+        /// </summary>
+        /// <value>The number of retries if unable to connect.</value>
+        int Retries { get; }
+
         /// <summary>
         /// Source type, based on ADO.Net provider name
         /// </summary>

src/SQLHelper.DB/SQLHelper.DB.csproj

@@ -27,10 +27,10 @@
   <ItemGroup>
     <PackageReference Include="SQLParser" Version="2.0.0" />
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
     <PackageReference Include="BigBook" Version="2.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
   </ItemGroup>
 

src/SQLHelper.DB/SQLHelper.cs

@@ -39,18 +39,18 @@ public class SQLHelper
         /// <param name="factory">The factory.</param>
         /// <param name="database">The database.</param>
         public SQLHelper(IConfiguration configuration, DbProviderFactory factory, string database = "Default")
+            : this(new Connection(configuration, factory, database))
         {
-            DatabaseConnection = new Connection(configuration, factory, database);
-            Batch = new Batch(DatabaseConnection);
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SQLHelper"/> class.
         /// </summary>
         /// <param name="connection">The connection to use.</param>
         public SQLHelper(IConnection connection)
-            : this(connection.Configuration, connection.Factory, connection.Name)
         {
+            DatabaseConnection = connection;
+            Batch = new Batch(DatabaseConnection);
         }
 
         /// <summary>

test/SQLHelper.Tests/BaseClasses/TestingDirectoryFixture.cs

@@ -30,7 +30,7 @@ public TestingDirectoryFixture()
                     try
                     {
                         TempCommand.CommandText = "Create Database TestDatabase";
-                        TempCommand.Open();
+                        TempCommand.Open(3);
                         TempCommand.ExecuteNonQuery();
                     }
                     catch { }
@@ -45,7 +45,7 @@ public TestingDirectoryFixture()
                     try
                     {
                         TempCommand.CommandText = "Create Table TestTable(ID INT PRIMARY KEY IDENTITY,StringValue1 NVARCHAR(100),StringValue2 NVARCHAR(MAX),BigIntValue BIGINT,BitValue BIT,DecimalValue DECIMAL(12,6),FloatValue FLOAT,DateTimeValue DATETIME,GUIDValue UNIQUEIDENTIFIER,TimeSpanValue TIME(7))";
-                        TempCommand.Open();
+                        TempCommand.Open(3);
                         TempCommand.ExecuteNonQuery();
                         TempCommand.CommandText = "Create Table TestTableNotNull(ID INT PRIMARY KEY IDENTITY,UShortValue_ SMALLINT NOT NULL)";
                         TempCommand.ExecuteNonQuery();
@@ -66,7 +66,7 @@ public void Dispose()
                     try
                     {
                         TempCommand.CommandText = "ALTER DATABASE TestDatabase SET OFFLINE WITH ROLLBACK IMMEDIATE\r\nALTER DATABASE TestDatabase SET ONLINE\r\nDROP DATABASE TestDatabase";
-                        TempCommand.Open();
+                        TempCommand.Open(3);
                         TempCommand.ExecuteNonQuery();
                     }
                     finally { TempCommand.Close(); }

test/SQLHelper.Tests/SQLHelper.Tests.csproj

@@ -23,10 +23,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="FileCurator" Version="2.0.2" />
+    <PackageReference Include="FileCurator" Version="2.0.3" />
   </ItemGroup>
 
   <ItemGroup>