Also handle async API throwing Exceptions

Author: mythz

src/ServiceStack.OrmLite/OrmLiteExecFilter.cs

@@ -105,12 +105,20 @@ public virtual Task<T> Exec<T>(IDbConnection dbConn, Func<IDbCommand, Task<T>> f
         {
             var dbCmd = CreateCommand(dbConn);
 
-            return filter(dbCmd)
-                .Then(t =>
-                {
-                    DisposeCommand(dbCmd, dbConn);
-                    return t;
-                });
+            try
+            {
+                return filter(dbCmd)
+                    .Then(t =>
+                    {
+                        DisposeCommand(dbCmd, dbConn);
+                        return t;
+                    });
+            }
+            catch
+            {
+                DisposeCommand(dbCmd, dbConn);
+                throw;
+            }
         }
 
         public virtual Task<IDbCommand> Exec(IDbConnection dbConn, Func<IDbCommand, Task<IDbCommand>> filter)

tests/ServiceStack.OrmLite.Tests/OrmLiteExecFilterTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Linq;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using ServiceStack.Common.Tests.Models;
 using ServiceStack.OrmLite.Tests.Expression;
@@ -50,6 +51,23 @@ public override T Exec<T>(IDbConnection dbConn, System.Func<IDbCommand, T> filte
                 throw;
             }
         }
+
+        public override Task<T> Exec<T>(IDbConnection dbConn, Func<IDbCommand, Task<T>> filter)
+        {
+            try
+            {
+                return base.Exec(dbConn, filter);
+            }
+            catch (Exception)
+            {
+                var sql = dbConn.GetLastSql();
+                if (sql == "exec sp_name @firstName, @age")
+                {
+                    return ((T)(object)new Person { FirstName = "Mocked" }).AsTaskResult();
+                }
+                throw;
+            }
+        }
     }
 
     [TestFixture]
@@ -93,6 +111,23 @@ public void Can_mock_store_procedure()
             OrmLiteConfig.DialectProvider.ExecFilter = holdExecFilter;
         }
 
+        [Test]
+        public async System.Threading.Tasks.Task Can_mock_store_procedure_Async()
+        {
+            var holdExecFilter = OrmLiteConfig.DialectProvider.ExecFilter;
+            OrmLiteConfig.DialectProvider.ExecFilter = new MockStoredProcExecFilter();
+
+            using (var db = OpenDbConnection())
+            {
+                var person = await db.SqlScalarAsync<Person>("exec sp_name @firstName, @age",
+                    new { firstName = "aName", age = 1 });
+
+                Assert.That(person.FirstName, Is.EqualTo("Mocked"));
+            }
+
+            OrmLiteConfig.DialectProvider.ExecFilter = holdExecFilter;
+        }
+
         [Test]
         public void Does_use_StringFilter()
         {