Merge pull request #30 from SubSonic-Core/dev/29-asynchronous-support

Dev/29 asynchronous support

Author: kccarter76

.gitignore

@@ -1,4 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and
+## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # Ignore local web.config as it is built-in automatically
@@ -252,3 +252,5 @@ _Pvt_Extensions
 /.vscode/launch.json
 
 # Ignore local nuget sources to force server sources
+SubSonic/MyKey.PublicKeyOnly.snk
+SubSonic/temp.txt

SubSonic.Extensions.SqlServer/SubSonic.Extensions.SqlServer.csproj

@@ -15,8 +15,11 @@
     <PackageLicenseFile>LICENSE.MD</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/kccarter76/SubSonic-Core/projects/1</PackageProjectUrl>
     <RepositoryUrl>https://github.com/kccarter76/SubSonic-Core/tree/master/SubSonic.Extensions.Test</RepositoryUrl>
-    <Version>4.1.0-alpha.1</Version>
+    <Version>4.1.0-alpha.2</Version>
     <NeutralLanguage>en</NeutralLanguage>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>SubSonicStrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

SubSonic.Extensions.SqlServer/SubSonicStrongName.snk

@@ -6,7 +6,7 @@
 
 namespace SubSonic.Extensions.Test
 {
-    [DbStoredProcedure(nameof(DeleteRealEstateProperty))]
+    [DbStoredProcedure(nameof(DeleteRealEstateProperty), IsNonQuery = true)]
     public class DeleteRealEstateProperty
         : DbSubSonicCommandQueryProcedure<Models.RealEstateProperty>
     {

SubSonic.Extensions.Test/Data/Procedures/DeleteRealEstateProperty.cs

@@ -177,7 +177,7 @@ public static DataTable ToDataTable<TEntity>(this IEnumerable<TEntity> source)
             }
         }
 
-        public static void AddCommandBehavior<TResult>(this DbProviderFactory factory, string command, Func<DbCommand, TResult> result)
+        public static void AddCommandBehavior(this DbProviderFactory factory, string command, Func<DbCommand, object> result)
         {
             if (factory is null)
             {

SubSonic.Extensions.Test/Extensions/UnitTestingExtensions.cs

@@ -2,14 +2,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace SubSonic.Extensions.Test.MockDbClient
 {
     using Syntax;
+    
     interface IMockCommandExecution
     {
         int ExecuteNonQuery(MockDbCommand cmd);
         object ExecuteScalar(MockDbCommand cmd);
         MockDbDataReaderCollection ExecuteDataReader(MockDbCommand cmd);
+        Task<MockDbDataReaderCollection> ExecuteDataReaderAsync(MockDbCommand cmd, CancellationToken cancellationToken);
     }
 }

SubSonic.Extensions.Test/MockDbClient/IMockCommandExecution.cs

@@ -126,4 +126,7 @@
   <data name="MissingDbParameter" xml:space="preserve">
     <value>Missing expected db parameter.</value>
   </data>
+  <data name="ResultSetIsNotDataTable" xml:space="preserve">
+    <value>The return is not of type DataTable.</value>
+  </data>
 </root>

SubSonic.Extensions.Test/MockDbClient/MockDBErrors.Designer.cs

@@ -4,6 +4,8 @@
 using System.Text;
 using System.Data;
 using System.Data.Common;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace SubSonic.Extensions.Test.MockDbClient
 {
@@ -91,21 +93,88 @@ private MockCommandBehavior FindBehavior(MockDbCommand cmd)
 
         int IMockCommandExecution.ExecuteNonQuery(MockDbCommand cmd)
         {
-            return GetReturnValue<int>(cmd);
+            if (GetReturnValue<int>(cmd) is int @return)
+            {
+                return @return;
+            }
+
+            throw Error.InvalidOperation();
         }
 
         object IMockCommandExecution.ExecuteScalar(MockDbCommand cmd)
         {
             return GetReturnValue<object>(cmd);
         }
 
+        async Task<MockDbDataReaderCollection> IMockCommandExecution.ExecuteDataReaderAsync(MockDbCommand cmd, CancellationToken cancellationToken)
+        {
+            string[] commands = cmd.CommandText.Split(';');
+
+            if (commands.Length == 1)
+            {   // command contains one select command
+                object value = GetReturnValue<DataTable>(cmd);
+
+                if (value is DataTable result)
+                {
+                    return new MockDbDataReaderCollection(result.CreateDataReader());
+                }
+                else if (value is null)
+                {
+                    return new MockDbDataReaderCollection();
+                }
+                else
+                {
+                    throw Error.InvalidOperation(MockDBErrors.ResultSetIsNotDataTable);
+                }
+            }
+            else
+            {
+                using (DataSet data = new DataSet())
+                {
+                    foreach (string sql in commands)
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+
+#pragma warning disable CA2100 // Review SQL queries for security vulnerabilities
+#pragma warning disable CA2000 // Dispose objects before losing scope
+                        if (GetReturnValue<DataTable>(new MockDbCommand(this, cmd.Parameters) { CommandText = sql.Trim("\r\n".ToCharArray()) }) is DataTable result)
+                        {
+                            data.Tables.Add(result);
+                        }
+#pragma warning restore CA2000 // Dispose objects before losing scope
+#pragma warning restore CA2100 // Review SQL queries for security vulnerabilities
+                    }
+
+                    if (data.Tables.Count == 0)
+                    {
+                        throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Could not find behavior for command '{0}'", cmd.CommandText));
+                    }
+
+                    return new MockDbDataReaderCollection(data.CreateDataReader());
+                }
+            }
+        }
+
         MockDbDataReaderCollection IMockCommandExecution.ExecuteDataReader(MockDbCommand cmd)
         {
             string[] commands = cmd.CommandText.Split(';');
 
             if (commands.Length == 1)
             {   // command contains one select command
-                return new MockDbDataReaderCollection(GetReturnValue<DataTable>(cmd).IsNotNull(x => x.CreateDataReader()));
+                object value = GetReturnValue<DataTable>(cmd);
+
+                if (value is DataTable result)
+                {
+                    return new MockDbDataReaderCollection(result.CreateDataReader());
+                }
+                else if (value is null)
+                {
+                    return new MockDbDataReaderCollection();
+                }
+                else
+                {
+                    throw Error.InvalidOperation(MockDBErrors.ResultSetIsNotDataTable);
+                }
             }
             else
             {
@@ -115,8 +184,7 @@ MockDbDataReaderCollection IMockCommandExecution.ExecuteDataReader(MockDbCommand
                     {
 #pragma warning disable CA2100 // Review SQL queries for security vulnerabilities
 #pragma warning disable CA2000 // Dispose objects before losing scope
-                        DataTable result = GetReturnValue<DataTable>(new MockDbCommand(this, cmd.Parameters) { CommandText = sql.Trim("\r\n".ToCharArray()) });
-                        if (!(result is null))
+                        if (GetReturnValue<DataTable>(new MockDbCommand(this, cmd.Parameters) { CommandText = sql.Trim("\r\n".ToCharArray()) }) is DataTable result)
                         {
                             data.Tables.Add(result);
                         }
@@ -134,7 +202,7 @@ MockDbDataReaderCollection IMockCommandExecution.ExecuteDataReader(MockDbCommand
             }
         }
 
-        public TReturn GetReturnValue<TReturn>(MockDbCommand cmd)
+        public object GetReturnValue<TReturn>(MockDbCommand cmd)
         {
             if (cmd is null)
             {
@@ -150,7 +218,7 @@ public TReturn GetReturnValue<TReturn>(MockDbCommand cmd)
 
             object value = behavior.ReturnValue;
 
-            if (value is Func<DbCommand, TReturn> func)
+            if (value is Func<DbCommand, object> func)
             {
                 return func(cmd);
             }

SubSonic.Extensions.Test/MockDbClient/MockDBErrors.resx

@@ -120,10 +120,26 @@ protected override DbDataReader ExecuteDbDataReader(System.Data.CommandBehavior
             }
         }
 
-        protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
+        protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
         {
+            try
+            {
+                if (this.Connection.State == ConnectionState.Open)
+                {
+                    Prepare();
 
-            return Task.Run(() => ExecuteDbDataReader(behavior), cancellationToken);
+                    return await _exec.ExecuteDataReaderAsync(this, cancellationToken)
+                        .ConfigureAwait(false);
+                }
+                else
+                {
+                    throw new InvalidOperationException(MockDBErrors.ConnectionStateNotOpen);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new MockDBException(ex.Message, ex);
+            }
         }
 
         public override int ExecuteNonQuery()