invalid rollback scenarios removed

nhlpa · Apr 16, 2024 · eab282c · eab282c
1 parent 8a5803b
commit eab282c
Showing 1 changed file with 22 additions and 80 deletions.
diff --git a/src/Spiffy/Batch/DbBatch.cs b/src/Spiffy/Batch/DbBatch.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Threading.Tasks;
 
 namespace Spiffy
@@ -251,99 +252,40 @@ public void Dispose()
       _transaction.Dispose();
     }
 
-    private void Do(string sql, DbParams param, Action<IDbCommand> action)
-    {
-      try
-      {
-        var cmd = new DbCommandBuilder(_transaction, sql, param ?? new DbParams()).Build();
-        action(cmd);
-      }
-      catch (FailedExecutionException)
-      {
-        Rollback();
-        throw;
-      }
-    }
+    private void Do(string sql, DbParams param, Action<IDbCommand> action) =>
+      action(new DbCommandBuilder(_transaction, sql, param ?? new DbParams()).Build());
 
-    private T Do<T>(string sql, DbParams param, Func<IDbCommand, T> func)
-    {
-      try
-      {
-        var cmd = new DbCommandBuilder(_transaction, sql, param ?? new DbParams()).Build();
-        return func(cmd);
-      }
-      catch (FailedExecutionException)
-      {
-        Rollback();
-        throw;
-      }
-    }
+    private T Do<T>(string sql, DbParams param, Func<IDbCommand, T> func) =>
+      func(new DbCommandBuilder(_transaction, sql, param ?? new DbParams()).Build());
 
-    private async Task DoAsync(string sql, DbParams param, Func<System.Data.Common.DbCommand, Task> func)
-    {
-      try
-      {
-        var cmd = new DbCommandBuilder(_transaction).CommandText(sql).DbParams(param).Build();
-        await func(cmd as System.Data.Common.DbCommand);
-      }
-      catch (FailedExecutionException)
-      {
-        Rollback();
-        throw;
-      }
-    }
+    private async Task DoAsync(string sql, DbParams param, Func<DbCommand, Task> func) =>
+      await func(new DbCommandBuilder(_transaction).CommandText(sql).DbParams(param).Build() as DbCommand);
 
-    private async Task<T> DoAsync<T>(string sql, DbParams param, Func<System.Data.Common.DbCommand, Task<T>> func)
-    {
-      try
-      {
-        var cmd = new DbCommandBuilder(_transaction).CommandText(sql).DbParams(param).Build();
-        return await func(cmd as System.Data.Common.DbCommand);
-      }
-      catch (FailedExecutionException)
-      {
-        Rollback();
-        throw;
-      }
-    }
+    private async Task<T> DoAsync<T>(string sql, DbParams param, Func<DbCommand, Task<T>> func) =>
+      await func(new DbCommandBuilder(_transaction).CommandText(sql).DbParams(param).Build() as DbCommand);
 
     private void DoMany(string sql, IEnumerable<DbParams> paramList, Action<IDbCommand> func)
     {
-      try
+      var cmd = new DbCommandBuilder(_transaction, sql).Build();
+
+      foreach (var param in paramList)
       {
-        var cmd = new DbCommandBuilder(_transaction, sql).Build();
-
-        foreach (var param in paramList)
-        {
-          cmd.Parameters.Clear();
-          cmd.SetDbParams(param);
-          func(cmd);
-        }
-      }
-      catch (FailedExecutionException)
-      {
-        Rollback();
-        throw;
+        cmd.Parameters.Clear();
+        cmd.SetDbParams(param);
+        func(cmd);
       }
+
     }
 
     private async Task DoManyAsync(string sql, IEnumerable<DbParams> paramList, Func<System.Data.Common.DbCommand, Task> func)
     {
-      try
-      {
-        var cmd = new DbCommandBuilder(_transaction, sql).Build() as System.Data.Common.DbCommand;
-
-        foreach (var param in paramList)
-        {
-          cmd.Parameters.Clear();
-          cmd.SetDbParams(param);
-          await func(cmd);
-        }
-      }
-      catch (FailedExecutionException)
+      var cmd = new DbCommandBuilder(_transaction, sql).Build() as System.Data.Common.DbCommand;
+
+      foreach (var param in paramList)
       {
-        Rollback();
-        throw;
+        cmd.Parameters.Clear();
+        cmd.SetDbParams(param);
+        await func(cmd);
       }
     }
   }