SqlDb v1.0.0.153 - command timeout parameter

il-katta · Feb 24, 2023 · 8fc35b3 · 8fc35b3
1 parent aa134b9
commit 8fc35b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ACUtils.SqlDb/ACUtils.SqlDb.csproj b/ACUtils.SqlDb/ACUtils.SqlDb.csproj
@@ -5,8 +5,8 @@
     <Authors>Andrea Cattaneo</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>1.0.0.152</Version>
-    <PackageVersion>1.0.0.152</PackageVersion>
+    <Version>1.0.0.153</Version>
+    <PackageVersion>1.0.0.153</PackageVersion>
     <Description>Utility per interrogazione database MSSQL</Description>
     <NeutralLanguage>it</NeutralLanguage>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/ACUtils.SqlDb/SqlDb.cs b/ACUtils.SqlDb/SqlDb.cs
@@ -20,6 +20,7 @@ public class SqlDb : IDisposable
 
         private static MissingSchemaAction missingSchemaAction = MissingSchemaAction.AddWithKey;
         public static MissingSchemaAction MissingSchemaAction { get => missingSchemaAction; set => missingSchemaAction = value; }
+        public static int? CommandTimeout;
 
         private static bool enforceConstraints = true;
         public static bool EnforceConstraints { get => enforceConstraints; set => enforceConstraints = value; }
@@ -53,7 +54,12 @@ public SqlDb(string connectionString, bool persistentConnection = false)
         #region generateCommand
         internal static SqlCommand generateCommand(SqlConnection connection, string queryString)
         {
-            return new SqlCommand(queryString, connection);
+            var command = new SqlCommand(queryString, connection);
+            if (CommandTimeout.HasValue)
+            {
+                command.CommandTimeout = CommandTimeout.Value;
+            }
+            return command;
         }
 
         internal static SqlCommand generateCommand(SqlConnection connection, string queryString, KeyValuePair<string, object>[] queryParams)
@@ -406,7 +412,7 @@ public static T GetColVal<T>(DataRow dataRow, string columnName)
             switch (val.GetType().Name)
             {
                 case "DBNull":
-                    return default(T);
+                    return default;
             }
             switch (typeof(T).Name)
             {