Merge pull request #193 from jonathanlarouche/master

Allowing Interface variable reference to be used for Update & Insert

Author: ericdc1

Dapper.SimpleCRUD/SimpleCRUD.cs

@@ -350,6 +350,13 @@ public static IEnumerable<T> GetListPaged<T>(this IDbConnection connection, int
         /// <returns>The ID (primary key) of the newly inserted record if it is identity using the defined type, otherwise null</returns>
         public static TKey Insert<TKey, TEntity>(this IDbConnection connection, TEntity entityToInsert, IDbTransaction transaction = null, int? commandTimeout = null)
         {
+            if (typeof(TEntity).IsInterface) //FallBack to BaseType Generic Method : https://stackoverflow.com/questions/4101784/calling-a-generic-method-with-a-dynamic-type
+            {
+                return (TKey)typeof(SimpleCRUD)
+                    .GetMethods().Where(methodInfo=>methodInfo.Name == nameof(Insert) && methodInfo.GetGenericArguments().Count()==2).Single()
+                    .MakeGenericMethod(new Type[] { typeof(TKey), entityToInsert.GetType() })
+                    .Invoke(null, new object[] { connection,entityToInsert,transaction,commandTimeout });
+            }
             var idProps = GetIdProperties(entityToInsert).ToList();
 
             if (!idProps.Any())
@@ -427,6 +434,13 @@ public static TKey Insert<TKey, TEntity>(this IDbConnection connection, TEntity
         /// <returns>The number of affected records</returns>
         public static int Update<TEntity>(this IDbConnection connection, TEntity entityToUpdate, IDbTransaction transaction = null, int? commandTimeout = null)
         {
+            if (typeof(TEntity).IsInterface) //FallBack to BaseType Generic Method: https://stackoverflow.com/questions/4101784/calling-a-generic-method-with-a-dynamic-type
+            {
+                return (int)typeof(SimpleCRUD)
+                    .GetMethods().Where(methodInfo => methodInfo.Name == nameof(Update) && methodInfo.GetGenericArguments().Count() == 1).Single()
+                    .MakeGenericMethod(new Type[] { entityToUpdate.GetType() })
+                    .Invoke(null, new object[] { connection, entityToUpdate, transaction, commandTimeout });
+            }
             var masterSb = new StringBuilder();
             StringBuilderCache(masterSb, $"{typeof(TEntity).FullName}_Update", sb =>
             {

Dapper.SimpleCRUD/SimpleCRUDAsync.cs

@@ -236,6 +236,13 @@ public static Task<IEnumerable<T>> GetListPagedAsync<T>(this IDbConnection conne
         /// <returns>The ID (primary key) of the newly inserted record if it is identity using the defined type, otherwise null</returns>
         public static async Task<TKey> InsertAsync<TKey, TEntity>(this IDbConnection connection, TEntity entityToInsert, IDbTransaction transaction = null, int? commandTimeout = null)
         {
+            if (typeof(TEntity).IsInterface) //FallBack to BaseType Generic Method : https://stackoverflow.com/questions/4101784/calling-a-generic-method-with-a-dynamic-type
+            {
+                return await (Task<TKey>)typeof(SimpleCRUD)
+                    .GetMethods().Where(methodInfo => methodInfo.Name == nameof(InsertAsync) && methodInfo.GetGenericArguments().Count() == 2).Single()
+                    .MakeGenericMethod(new Type[] { typeof(TKey), entityToInsert.GetType() })
+                    .Invoke(null, new object[] { connection, entityToInsert, transaction, commandTimeout });
+            }
             var idProps = GetIdProperties(entityToInsert).ToList();
 
             if (!idProps.Any())
@@ -310,8 +317,15 @@ public static async Task<TKey> InsertAsync<TKey, TEntity>(this IDbConnection con
         /// <param name="transaction"></param>
         /// <param name="commandTimeout"></param>
         /// <returns>The number of affected records</returns>
-        public static Task<int> UpdateAsync<TEntity>(this IDbConnection connection, TEntity entityToUpdate, IDbTransaction transaction = null, int? commandTimeout = null, System.Threading.CancellationToken? token = null)
+        public static async Task<int> UpdateAsync<TEntity>(this IDbConnection connection, TEntity entityToUpdate, IDbTransaction transaction = null, int? commandTimeout = null, System.Threading.CancellationToken? token = null)
         {
+            if (typeof(TEntity).IsInterface) //FallBack to BaseType Generic Method : https://stackoverflow.com/questions/4101784/calling-a-generic-method-with-a-dynamic-type
+            {
+                return await(Task<int>)typeof(SimpleCRUD)
+                   .GetMethods().Where(methodInfo => methodInfo.Name == nameof(UpdateAsync) && methodInfo.GetGenericArguments().Count() == 1).Single()
+                   .MakeGenericMethod(new Type[] { entityToUpdate.GetType() })
+                   .Invoke(null, new object[] { connection, entityToUpdate, transaction, commandTimeout, token });
+            }
             var idProps = GetIdProperties(entityToUpdate).ToList();
 
             if (!idProps.Any())
@@ -331,7 +345,7 @@ public static Task<int> UpdateAsync<TEntity>(this IDbConnection connection, TEnt
                 Trace.WriteLine(String.Format("Update: {0}", sb));
 
             System.Threading.CancellationToken cancelToken = token ?? default(System.Threading.CancellationToken);
-            return connection.ExecuteAsync(new CommandDefinition(sb.ToString(), entityToUpdate, transaction, commandTimeout, cancellationToken: cancelToken));
+            return await connection.ExecuteAsync(new CommandDefinition(sb.ToString(), entityToUpdate, transaction, commandTimeout, cancellationToken: cancelToken));
         }
 
         /// <summary>

Dapper.SimpleCRUDTests/Program.cs

@@ -12,6 +12,8 @@ namespace Dapper.SimpleCRUDTests
 {
     class Program
     {
+        public const string SQLServerName = @".\sqlexpress";
+
         static void Main()
         {
             //Setup();
@@ -38,7 +40,7 @@ static void Main()
 
         private static void Setup()
         {
-            using (var connection = new SqlConnection(@"Data Source=.\sqlexpress;Initial Catalog=Master;Integrated Security=True"))
+            using (var connection = new SqlConnection($@"Data Source={SQLServerName};Initial Catalog=Master;Integrated Security=True"))
             {
                 connection.Open();
                 try
@@ -51,7 +53,7 @@ private static void Setup()
                 connection.Execute(@" CREATE DATABASE DapperSimpleCrudTestDb; ");
             }
 
-            using (var connection = new SqlConnection(@"Data Source = .\sqlexpress;Initial Catalog=DapperSimpleCrudTestDb;Integrated Security=True"))
+            using (var connection = new SqlConnection($@"Data Source ={SQLServerName};Initial Catalog=DapperSimpleCrudTestDb;Integrated Security=True"))
             {
                 connection.Open();
                 connection.Execute(@" create table Users (Id int IDENTITY(1,1) not null, Name nvarchar(100) not null, Age int not null, ScheduledDayOff int null, CreatedDate datetime DEFAULT(getdate())) ");
@@ -170,7 +172,7 @@ private static void RunTests()
             // Write result
             Console.WriteLine("Time elapsed: {0}", stopwatch.Elapsed);
 
-            using (var connection = new SqlConnection(@"Data Source=.\sqlexpress;Initial Catalog=Master;Integrated Security=True"))
+            using (var connection = new SqlConnection($@"Data Source={SQLServerName};Initial Catalog=Master;Integrated Security=True"))
             {
                 connection.Open();
                 try

Dapper.SimpleCRUDTests/Tests.cs

@@ -102,6 +102,23 @@ public class City
         public int Population { get; set; }
     }
 
+    public interface INameColumn
+    {
+        string Name { get; set; }
+    }
+
+    [Table("City")]
+    public class CityWithIName : City, INameColumn
+    {
+
+    }
+
+    [Table("Users")]
+    public class UserWithIName : User, INameColumn
+    {
+
+    }
+
     public class GUIDTest
     {
         [Key]
@@ -198,7 +215,7 @@ private IDbConnection GetOpenConnection()
             }
             else
             {
-                connection = new SqlConnection(@"Data Source = .\sqlexpress;Initial Catalog=DapperSimpleCrudTestDb;Integrated Security=True;MultipleActiveResultSets=true;");
+                connection = new SqlConnection($@"Data Source={Program.SQLServerName};Initial Catalog=DapperSimpleCrudTestDb;Integrated Security=True;MultipleActiveResultSets=true;");
                 SimpleCRUD.SetDialect(SimpleCRUD.Dialect.SQLServer);
             }
 
@@ -220,7 +237,7 @@ public void TestInsertWithSpecifiedTableName()
             }
         }
 
-        public void TestMassInsert() 
+        public void TestMassInsert()
         {
             //With cached strinb builder, this tests runs 2.5X faster (From 400ms to 180ms)
             using (var connection = GetOpenConnection())
@@ -804,14 +821,13 @@ public void TestMultipleKeyGetAsync()
             }
         }
 
-        public void TestDeleteByIdAsync()
+        public async void TestDeleteByIdAsync()
         {
             using (var connection = GetOpenConnection())
             {
                 var id = connection.Insert(new User { Name = "UserAsyncDelete", Age = 10 });
-                connection.DeleteAsync<User>(id);
+                await connection.DeleteAsync<User>(id);
                 //tiny wait to let the delete happen
-                System.Threading.Thread.Sleep(300);
                 connection.Get<User>(id).IsNull();
             }
         }
@@ -1298,6 +1314,128 @@ public void TestGetListNullableWhere()
             }
         }
 
+        public void TestInsertUsingInterface()
+        {
+            using (var connection = GetOpenConnection())
+            using (var transaction = connection.BeginTransaction())
+            {
+                INameColumn newUser = new UserWithIName
+                {
+                    Age = 40,
+                    Name = "Jonathan Larouche",
+                    ScheduledDayOff = DayOfWeek.Sunday,
+                    CreatedDate = new DateTime(2000, 1, 1)
+                };
+
+                connection.Insert(newUser, transaction);
+
+                INameColumn newCity = new CityWithIName
+                {
+                    Name = "Montreal",
+                    Population = 5675
+                };
+
+                connection.Insert<string, INameColumn>(newCity, transaction);
+
+                var user = connection.GetList<UserWithIName>(new { Name = "Jonathan Larouche" }, transaction).FirstOrDefault();
+                user.Age.IsEqualTo(40);
+                var city = connection.GetList<CityWithIName>(new { Name = "Montreal" }, transaction).FirstOrDefault();
+                city.Population.IsEqualTo(5675);
+
+            }
+        }
+
+        public async void TestInsertAsyncUsingInterface()
+        {
+            using (var connection = GetOpenConnection())
+            using (var transaction = connection.BeginTransaction())
+            {
+                INameColumn newUser = new UserWithIName
+                {
+                    Age = 40,
+                    Name = "Jonathan Larouche",
+                    ScheduledDayOff = DayOfWeek.Sunday,
+                    CreatedDate = new DateTime(2000, 1, 1)
+                };
+
+                await connection.InsertAsync(newUser, transaction);
+                
+                var user = connection.GetList<UserWithIName>(new { Name = "Jonathan Larouche" }, transaction).FirstOrDefault();
+                user.Age.IsEqualTo(40);
+
+            }
+        }
+
+        public void TestUpdateUsingInterface()
+        {
+            using (var connection = GetOpenConnection())
+            using (var transaction = connection.BeginTransaction())
+            {
+                INameColumn newUser = new UserWithIName
+                {
+                    Age = 40,
+                    Name = "Jonathan Larouche",
+                    ScheduledDayOff = DayOfWeek.Sunday,
+                    CreatedDate = new DateTime(2000, 1, 1)
+                };
+
+                ((UserWithIName)newUser).Id = connection.Insert(newUser, transaction).Value;
+                ((UserWithIName)newUser).Age = 41;
+                connection.Update(newUser, transaction);
+
+                INameColumn newCity = new CityWithIName
+                {
+                    Name = "Montreal",
+                    Population = 5675
+                };
+
+                connection.Insert<string, INameColumn>(newCity, transaction);
+                ((CityWithIName)newCity).Population = 6000;
+                connection.Update(newCity, transaction);
+
+                var user = connection.GetList<UserWithIName>(new { Name = "Jonathan Larouche" }, transaction).FirstOrDefault();
+                user.Age.IsEqualTo(41);
+                var city = connection.GetList<CityWithIName>(new { Name = "Montreal" }, transaction).FirstOrDefault();
+                city.Population.IsEqualTo(6000);
+
+            }
+        }
+
+        public async void TestUpdateAsyncUsingInterface()
+        {
+            using (var connection = GetOpenConnection())
+            using (var transaction = connection.BeginTransaction())
+            {
+                INameColumn newUser = new UserWithIName
+                {
+                    Age = 40,
+                    Name = "Jonathan Larouche",
+                    ScheduledDayOff = DayOfWeek.Sunday,
+                    CreatedDate = new DateTime(2000, 1, 1)
+                };
+
+                ((UserWithIName)newUser).Id = connection.Insert(newUser, transaction).Value;
+                ((UserWithIName)newUser).Age = 41;
+                await connection.UpdateAsync(newUser, transaction);
+
+                INameColumn newCity = new CityWithIName
+                {
+                    Name = "Montreal",
+                    Population = 5675
+                };
+
+                connection.Insert<string, INameColumn>(newCity, transaction);
+                ((CityWithIName)newCity).Population = 6000;
+                await connection.UpdateAsync(newCity, transaction);
+
+                var user = connection.GetList<UserWithIName>(new { Name = "Jonathan Larouche" }, transaction).FirstOrDefault();
+                user.Age.IsEqualTo(41);
+                var city = connection.GetList<CityWithIName>(new { Name = "Montreal" }, transaction).FirstOrDefault();
+                city.Population.IsEqualTo(6000);
+
+            }
+        }
+
         //ignore attribute tests
         //i cheated here and stuffed all of these in one test
         //didn't implement in postgres or mysql tests yet