Use default mapping

zzzprojects · Oct 18, 2016 · 480aa3e · 480aa3e
1 parent 1e0c379
commit 480aa3e
Show file tree

Hide file tree

Showing 10 changed files with 229 additions and 33 deletions.
diff --git a/src/Z.Dapper.Plus.NET40/DapperPlusAction/Method/Execute.cs b/src/Z.Dapper.Plus.NET40/DapperPlusAction/Method/Execute.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
+using System.Text;
 using Z.BulkOperations;
 
 namespace Z.Dapper.Plus
@@ -106,11 +107,69 @@ public void Execute()
 
             if (!DapperPlusManager.MapperCache.TryGetValue(mapperKey, out config))
             {
-                var elementType = DataSource.GetType().GetElementType();
-                var constructor = typeof (DapperPlusEntityMapper<>).MakeGenericType(elementType).GetConstructor(new Type[0]);
-                config = (DapperPlusEntityMapper) constructor.Invoke(new object[0]);
+                // CHECK for Entity Framework Proxy Type
+                if (mapperKey.StartsWith("zzz_proxy;"))
+                {
+                    var mapperProxy = new List<DapperPlusEntityMapper>();
+                    // Try to find if one mapping could correspond
+                    foreach (var keyValue in DapperPlusManager.MapperCache)
+                    {
+                        var key = keyValue.Key;
+                        var prefix = string.IsNullOrEmpty(Key) ? "zzz_null" : Key;
+
+                        // MUST start with the same suffix
+                        if (!key.StartsWith(prefix)) continue;
+
+                        var suffix = key.Split('.').Last().Split('+').Last();
+                        var mapperSuffix = mapperKey.Split(';').Last();
+
+                        if (suffix.Length < 20)
+                        {
+                            // MUST BE Equal
+                            if (suffix != mapperSuffix) continue;
+                        }
+                        else
+                        {
+                            // MUST START with same name but only one!
+                            if (!suffix.StartsWith(mapperSuffix)) continue;
+                        }
+
+                        mapperProxy.Add(keyValue.Value);
+                    }
+
+                    if (mapperProxy.Count == 1)
+                    {
+                        config = mapperProxy[0];
+                    }
+                }
+
+                if (config == null)
+                {
+                    if (DapperPlusManager.ThrowErrorIfNotMapped)
+                    {
+                        StringBuilder sb = new StringBuilder();
+                        sb.AppendLine("Mapping Not Found!");
+                        sb.AppendLine("Current MapperKey: " + mapperKey);
+                        sb.AppendLine("Possible Mapping:");
+                        foreach (var keyValue in DapperPlusManager.MapperCache)
+                        {
+                            sb.AppendLine("   - " + keyValue.Key);
+                        }
+
+                        throw new Exception(sb.ToString());
+                    }
+                    else
+                    {
+                        var type = DataSource.GetType();
+                        var elementType = type.GetGenericArguments()[0];
+                        var constructor = typeof(DapperPlusEntityMapper<>).MakeGenericType(elementType).GetConstructor(new Type[0]);
+                        config = (DapperPlusEntityMapper)constructor.Invoke(new object[0]);
+                    }
+
+                }
             }
 
+            bulkOperation._isDapperPlus = true;
             bulkOperation.DataSource = DataSource;
             bulkOperation.AllowDuplicateKeys = true;
             bulkOperation.CaseSensitive = CaseSensitiveType.DestinationInsensitive;

diff --git a/src/Z.Dapper.Plus.NET40/DapperPlusAction/Method/Map.cs b/src/Z.Dapper.Plus.NET40/DapperPlusAction/Method/Map.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Z.BulkOperations;
 
 namespace Z.Dapper.Plus
@@ -16,7 +17,8 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
             var isIdentityModified = config.IsIdentityModified();
             var isIgnoreModified = config.IsIgnoreModified();
 
-            var isModified = isMapModified.HasValue && isMapModified.Value
+            var isModified = config._columnMappings == null
+                             || isMapModified.HasValue && isMapModified.Value
                              || isKeyModified.HasValue && isKeyModified.Value
                              || isOutputModified.HasValue && isOutputModified.Value
                              || isIdentityModified.HasValue && isIdentityModified.Value
@@ -57,7 +59,16 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
                 }
                 else
                 {
-                    columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, Output = true});
+                    // CHECK smart mapping
+                    if (string.IsNullOrEmpty(accessor.Member) && columnMappings.Count(x => x.SourceName == accessor.ToString()) == 1)
+                    {
+                        columnMapping = columnMappings.Find(x => x.SourceName == accessor.ToString());
+                        columnMapping.Output = true;
+                    }
+                    else
+                    {
+                        columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, Output = true});
+                    }
                 }
             }
 
@@ -70,7 +81,16 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
                 }
                 else
                 {
-                    columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsPrimaryKey = true});
+                    // CHECK smart mapping
+                    if (string.IsNullOrEmpty(accessor.Member) && columnMappings.Count(x => x.SourceName == accessor.ToString()) == 1)
+                    {
+                        columnMapping = columnMappings.Find(x => x.SourceName == accessor.ToString());
+                        columnMapping.IsPrimaryKey = true;
+                    }
+                    else
+                    {
+                        columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsPrimaryKey = true});
+                    }
                 }
             }
 
@@ -83,7 +103,16 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
                 }
                 else
                 {
-                    columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsIdentity = true});
+                    // CHECK smart mapping
+                    if (string.IsNullOrEmpty(accessor.Member) && columnMappings.Count(x => x.SourceName == accessor.ToString()) == 1)
+                    {
+                        columnMapping = columnMappings.Find(x => x.SourceName == accessor.ToString());
+                        columnMapping.IsIdentity = true;
+                    }
+                    else
+                    {
+                        columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsIdentity = true});
+                    }
                 }
             }
 

diff --git a/src/Z.Dapper.Plus.NET40/DapperPlusManager.cs b/src/Z.Dapper.Plus.NET40/DapperPlusManager.cs
@@ -7,6 +7,7 @@ namespace Z.Dapper.Plus
     /// <summary>Manager for dapper plus.</summary>
     public class DapperPlusManager
     {
+        public static bool ThrowErrorIfNotMapped { get; set; }
         /// <summary>The mapper cache.</summary>
         private static ConcurrentDictionary<string, DapperPlusEntityMapper> _mapperCache;
 
@@ -65,7 +66,20 @@ public static string GetFullMapperKey<T>(string mapperKey)
 
         public static string GetFullMapperKey(Type type, string mapperKey)
         {
-            var fullKey = mapperKey ?? "zzz_null" + ";" + type.FullName;
+            var fullKey = mapperKey ?? "zzz_null" + ";";
+
+            if (type.FullName.StartsWith("System.Data.Entity.DynamicProxies"))
+            {
+                // Oops! Entity Framework Proxy Type
+                var name = type.FullName.Remove(0, "System.Data.Entity.DynamicProxies.".Length).Split('_')[0];
+                fullKey = "zzz_proxy;" + fullKey;
+                fullKey += name;
+            }
+            else
+            {
+                fullKey += type.FullName;
+            }
+
             return fullKey;
         }
     }

diff --git a/src/Z.Dapper.Plus.NET40/Properties/AssemblyInfo.cs b/src/Z.Dapper.Plus.NET40/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("dcb2a0f8-0619-4c45-870f-fa2676fbb9b5")]
-[assembly: AssemblyVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
+[assembly: AssemblyVersion("1.0.6")]
+[assembly: AssemblyFileVersion("1.0.6")]
diff --git a/src/Z.Dapper.Plus.NET40/Z.Dapper.Plus.NET40.csproj b/src/Z.Dapper.Plus.NET40/Z.Dapper.Plus.NET40.csproj
@@ -41,10 +41,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Z.BulkOperations, Version=2.9.25.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.BulkOperations.2.9.25\lib\net40\Z.BulkOperations.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BaseDapperPlusActionSet.cs" />
@@ -125,9 +121,6 @@
       <Name>Z.BulkOperations.NET40</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/Z.Dapper.Plus/DapperPlusAction/Method/Execute.cs b/src/Z.Dapper.Plus/DapperPlusAction/Method/Execute.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
+using System.Text;
 using Z.BulkOperations;
 
 namespace Z.Dapper.Plus
@@ -106,11 +107,69 @@ public void Execute()
 
             if (!DapperPlusManager.MapperCache.TryGetValue(mapperKey, out config))
             {
-                var elementType = DataSource.GetType().GetElementType();
-                var constructor = typeof (DapperPlusEntityMapper<>).MakeGenericType(elementType).GetConstructor(new Type[0]);
-                config = (DapperPlusEntityMapper) constructor.Invoke(new object[0]);
+                // CHECK for Entity Framework Proxy Type
+                if (mapperKey.StartsWith("zzz_proxy;"))
+                {
+                    var mapperProxy = new List<DapperPlusEntityMapper>();
+                    // Try to find if one mapping could correspond
+                    foreach (var keyValue in DapperPlusManager.MapperCache)
+                    {
+                        var key = keyValue.Key;
+                        var prefix = string.IsNullOrEmpty(Key) ? "zzz_null" : Key;
+
+                        // MUST start with the same suffix
+                        if (!key.StartsWith(prefix)) continue;
+
+                        var suffix = key.Split('.').Last().Split('+').Last();
+                        var mapperSuffix = mapperKey.Split(';').Last();
+
+                        if (suffix.Length < 20)
+                        {
+                            // MUST BE Equal
+                            if (suffix != mapperSuffix) continue;
+                        }
+                        else
+                        {
+                            // MUST START with same name but only one!
+                            if (!suffix.StartsWith(mapperSuffix)) continue;
+                        }
+
+                        mapperProxy.Add(keyValue.Value);
+                    }
+
+                    if (mapperProxy.Count == 1)
+                    {
+                        config = mapperProxy[0];
+                    }
+                }
+
+                if (config == null)
+                {
+                    if (DapperPlusManager.ThrowErrorIfNotMapped)
+                    {
+                        StringBuilder sb = new StringBuilder();
+                        sb.AppendLine("Mapping Not Found!");
+                        sb.AppendLine("Current MapperKey: " + mapperKey);
+                        sb.AppendLine("Possible Mapping:");
+                        foreach (var keyValue in DapperPlusManager.MapperCache)
+                        {
+                            sb.AppendLine("   - " + keyValue.Key);
+                        }
+
+                        throw new Exception(sb.ToString());
+                    }
+                    else
+                    {
+                        var type = DataSource.GetType();
+                        var elementType = type.GetGenericArguments()[0];
+                        var constructor = typeof(DapperPlusEntityMapper<>).MakeGenericType(elementType).GetConstructor(new Type[0]);
+                        config = (DapperPlusEntityMapper)constructor.Invoke(new object[0]);
+                    }
+
+                }
             }
 
+            bulkOperation._isDapperPlus = true;
             bulkOperation.DataSource = DataSource;
             bulkOperation.AllowDuplicateKeys = true;
             bulkOperation.CaseSensitive = CaseSensitiveType.DestinationInsensitive;

diff --git a/src/Z.Dapper.Plus/DapperPlusAction/Method/Map.cs b/src/Z.Dapper.Plus/DapperPlusAction/Method/Map.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Z.BulkOperations;
 
 namespace Z.Dapper.Plus
@@ -16,7 +17,8 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
             var isIdentityModified = config.IsIdentityModified();
             var isIgnoreModified = config.IsIgnoreModified();
 
-            var isModified = isMapModified.HasValue && isMapModified.Value
+            var isModified = config._columnMappings == null
+                             || isMapModified.HasValue && isMapModified.Value
                              || isKeyModified.HasValue && isKeyModified.Value
                              || isOutputModified.HasValue && isOutputModified.Value
                              || isIdentityModified.HasValue && isIdentityModified.Value
@@ -57,7 +59,16 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
                 }
                 else
                 {
-                    columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, Output = true});
+                    // CHECK smart mapping
+                    if (string.IsNullOrEmpty(accessor.Member) && columnMappings.Count(x => x.SourceName == accessor.ToString()) == 1)
+                    {
+                        columnMapping = columnMappings.Find(x => x.SourceName == accessor.ToString());
+                        columnMapping.Output = true;
+                    }
+                    else
+                    {
+                        columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, Output = true});
+                    }
                 }
             }
 
@@ -70,7 +81,16 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
                 }
                 else
                 {
-                    columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsPrimaryKey = true});
+                    // CHECK smart mapping
+                    if (string.IsNullOrEmpty(accessor.Member) && columnMappings.Count(x => x.SourceName == accessor.ToString()) == 1)
+                    {
+                        columnMapping = columnMappings.Find(x => x.SourceName == accessor.ToString());
+                        columnMapping.IsPrimaryKey = true;
+                    }
+                    else
+                    {
+                        columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsPrimaryKey = true});
+                    }
                 }
             }
 
@@ -83,7 +103,16 @@ public void Map(BulkOperation bulkOperation, DapperPlusEntityMapper config)
                 }
                 else
                 {
-                    columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsIdentity = true});
+                    // CHECK smart mapping
+                    if (string.IsNullOrEmpty(accessor.Member) && columnMappings.Count(x => x.SourceName == accessor.ToString()) == 1)
+                    {
+                        columnMapping = columnMappings.Find(x => x.SourceName == accessor.ToString());
+                        columnMapping.IsIdentity = true;
+                    }
+                    else
+                    {
+                        columnMappings.Add(new DapperPlusColumnMapping {SourceName = accessor.ToString(), DestinationName = accessor.Member, IsIdentity = true});
+                    }
                 }
             }
 

diff --git a/src/Z.Dapper.Plus/DapperPlusManager.cs b/src/Z.Dapper.Plus/DapperPlusManager.cs
@@ -7,6 +7,7 @@ namespace Z.Dapper.Plus
     /// <summary>Manager for dapper plus.</summary>
     public class DapperPlusManager
     {
+        public static bool ThrowErrorIfNotMapped { get; set; }
         /// <summary>The mapper cache.</summary>
         private static ConcurrentDictionary<string, DapperPlusEntityMapper> _mapperCache;
 
@@ -65,7 +66,20 @@ public static string GetFullMapperKey<T>(string mapperKey)
 
         public static string GetFullMapperKey(Type type, string mapperKey)
         {
-            var fullKey = mapperKey ?? "zzz_null" + ";" + type.FullName;
+            var fullKey = mapperKey ?? "zzz_null" + ";";
+
+            if (type.FullName.StartsWith("System.Data.Entity.DynamicProxies"))
+            {
+                // Oops! Entity Framework Proxy Type
+                var name = type.FullName.Remove(0, "System.Data.Entity.DynamicProxies.".Length).Split('_')[0];
+                fullKey = "zzz_proxy;" + fullKey;
+                fullKey += name;
+            }
+            else
+            {
+                fullKey += type.FullName;
+            }
+
             return fullKey;
         }
     }