Fix CopyFrom

Fix CopyFrom

Author: zzzprojects

src/shared/Z.EF.Plus._Core.Shared/EF/DbParameter/DbParameter.CopyFrom.cs

@@ -13,9 +13,12 @@
 
 #if EF5
 using System.Data.Objects;
+using System.Data.SqlClient;
 #elif EF6
+using System.Data.SqlClient;
 #elif EFCORE
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
 #endif
 
 namespace Z.EntityFramework.Plus
@@ -35,6 +38,17 @@ public static void CopyFrom(this DbParameter @this, DbParameter from)
             @this.ParameterName = from.ParameterName;
             @this.Size = from.Size;
 
+#if !EFCORE
+            if (from is SqlParameter)
+            {
+                var fromSql = (SqlParameter)from;
+                var toSql = (SqlParameter)@this;
+
+                toSql.SqlDbType = fromSql.SqlDbType;
+                toSql.UdtTypeName = fromSql.UdtTypeName;
+            }
+#endif
+
 #if EF6
             if(fullName.Contains("Oracle") && from.GetType().GetProperty("OracleDbType") != null)
             {
@@ -59,6 +73,17 @@ public static void CopyFrom(this DbParameter @this, DbParameter from, string new
             @this.ParameterName = newParameterName;
             @this.Size = from.Size;
 
+#if !EFCORE
+            if (from is SqlParameter)
+            {
+                var fromSql = (SqlParameter) from;
+                var toSql = (SqlParameter) @this;
+
+                toSql.SqlDbType = fromSql.SqlDbType;
+                toSql.UdtTypeName = fromSql.UdtTypeName;
+            }
+#endif
+
 #if EF6
             if (fullName.Contains("Oracle") && from.GetType().GetProperty("OracleDbType") != null)
             {
@@ -90,13 +115,43 @@ public static void CopyFrom(this DbParameter @this, IRelationalParameter from, o
         {
             @this.ParameterName = from.InvariantName;
 
+            if (from is TypeMappedRelationalParameter)
+            {
+                var relationalTypeMappingProperty = typeof(TypeMappedRelationalParameter).GetProperty("RelationalTypeMapping", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+                if (relationalTypeMappingProperty != null)
+                {
+                    var relationalTypeMapping = (RelationalTypeMapping)relationalTypeMappingProperty.GetValue(from);
+
+                    if (relationalTypeMapping.DbType.HasValue)
+                    {
+                        @this.DbType = relationalTypeMapping.DbType.Value;
+                    }
+                }
+            }
+
             @this.Value = value ?? DBNull.Value;
         }
 
         public static void CopyFrom(this DbParameter @this, IRelationalParameter from, object value, string newParameterName)
         {
             @this.ParameterName = newParameterName;
 
+            if (from is TypeMappedRelationalParameter)
+            {
+                var relationalTypeMappingProperty = typeof(TypeMappedRelationalParameter).GetProperty("RelationalTypeMapping", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+                if (relationalTypeMappingProperty != null)
+                {
+                    var relationalTypeMapping = (RelationalTypeMapping) relationalTypeMappingProperty.GetValue(from);
+
+                    if (relationalTypeMapping.DbType.HasValue)
+                    {
+                        @this.DbType = relationalTypeMapping.DbType.Value;
+                    }
+                }
+            }
+
             @this.Value = value ?? DBNull.Value;
         }
 #endif

version.txt

@@ -1 +1 @@
-v1.6.11
+v1.6.13