Merge branch 'master' of https://github.com/dotnetcore/FreeSql

FreeSql.Tests/FreeSql.Tests/Internal/UtilsTest.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+using Xunit;
+
+namespace FreeSql.Tests.Internal
+{
+
+    public class UtilsTest
+    {
+        [Fact]
+        public void TestGetDbParamtersByObject()
+        {
+            var ps = FreeSql.Internal.Utils.
+                   GetDbParamtersByObject<DbParameter>("select @p",
+                   new { p = (DbParameter)new SqlParameter() { ParameterName = "p", Value = "test" } },
+                   "@",
+                   (name, type, value) =>
+                      {
+                          if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
+                          var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
+                          return ret;
+                      });
+            Assert.Single(ps);
+            Assert.Equal("test", ps[0].Value);
+            Assert.Equal("p", ps[0].ParameterName);
+            Assert.Equal(typeof(SqlParameter), ps[0].GetType());
+
+
+            var ps2 = FreeSql.Internal.Utils.
+                   GetDbParamtersByObject<DbParameter>("select @p",
+                   new Dictionary<string, DbParameter> { { "p", (DbParameter)new SqlParameter() { ParameterName = "p", Value = "test" } } },
+                   "@",
+                   (name, type, value) =>
+                   {
+                       if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
+                       var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
+                       return ret;
+                   });
+            Assert.Single(ps2);
+            Assert.Equal("test", ps2[0].Value);
+            Assert.Equal("p", ps2[0].ParameterName);
+            Assert.Equal(typeof(SqlParameter), ps2[0].GetType());
+        }
+    }
+}

FreeSql.Tests/FreeSql.Tests/UnitTest1.cs

@@ -24,7 +24,7 @@ namespace FreeSql.Tests
     {
         public static T TryTo<T>(this string that)
         {
-            return (T)Internal.Utils.GetDataReaderValue(typeof(T), that);
+            return (T)FreeSql.Internal.Utils.GetDataReaderValue(typeof(T), that);
         }
 
         public static string FormatDateTime()
@@ -464,7 +464,8 @@ namespace FreeSql.Tests
             emoji = g.sqlserver.Select<TestGuidId>().Where(a => a.Id == testemoji.Id).First();
             Assert.Equal("💐🌸💮🌹🌺🌻🌼🌷🌱🌿🍀", emoji.xxx);
 
-            var _model = new TestUpdateModel { 
+            var _model = new TestUpdateModel
+            {
                 F_EmpId = "xx11",
                 F_RoleType = TestUpdateModelEnum.x2,
                 F_UseType = TestUpdateModelEnum.x3
@@ -600,7 +601,7 @@ namespace FreeSql.Tests
 
             IFreeSql fsql = new FreeSql.FreeSqlBuilder()
               .UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=7")
-              .UseNameConvert(Internal.NameConvertType.PascalCaseToUnderscoreWithLower)
+              .UseNameConvert(FreeSql.Internal.NameConvertType.PascalCaseToUnderscoreWithLower)
               .UseNoneCommandParameter(true)
               .UseAutoSyncStructure(true) //自动同步实体结构到数据库
               .UseMonitorCommand(a => Trace.WriteLine(a.CommandText))

FreeSql/Internal/UtilsExpressionTree.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
@@ -1272,12 +1273,13 @@ namespace FreeSql.Internal
         });
 
         public static T[] GetDbParamtersByObject<T>(string sql, object obj, string paramPrefix, Func<string, Type, object, T> constructorParamter)
+            where T : IDataParameter
         {
             if (string.IsNullOrEmpty(sql) || obj == null) return new T[0];
             var isCheckSql = sql != "*";
             var ttype = typeof(T);
             var type = obj.GetType();
-            if (type == ttype) return new[] { (T)Convert.ChangeType(obj, type) };
+            if (ttype.IsAssignableFrom(type)) return new[] { (T)obj };
             var ret = new List<T>();
             var dic = obj as IDictionary;
             if (dic != null)
@@ -1288,7 +1290,7 @@ namespace FreeSql.Internal
                     if (isCheckSql && string.IsNullOrEmpty(paramPrefix) == false && sql.IndexOf($"{paramPrefix}{dbkey}", StringComparison.CurrentCultureIgnoreCase) == -1) continue;
                     var val = dic[key];
                     var valType = val == null ? typeof(string) : val.GetType();
-                    if (valType == ttype) ret.Add((T)Convert.ChangeType(val, ttype));
+                    if (ttype.IsAssignableFrom(valType)) ret.Add((T)val);
                     else ret.Add(constructorParamter(dbkey, valType, val));
                 }
             }
@@ -1299,7 +1301,7 @@ namespace FreeSql.Internal
                 {
                     if (isCheckSql && string.IsNullOrEmpty(paramPrefix) == false && sql.IndexOf($"{paramPrefix}{p.Name}", StringComparison.CurrentCultureIgnoreCase) == -1) continue;
                     var pvalue = p.GetValue(obj, null);
-                    if (p.PropertyType == ttype) ret.Add((T)Convert.ChangeType(pvalue, ttype));
+                    if (ttype.IsAssignableFrom(p.PropertyType)) ret.Add((T)pvalue);
                     else ret.Add(constructorParamter(p.Name, p.PropertyType, pvalue));
                 }
             }