tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 参数值为原始DbParameter时转换类型报错

Browse Source
This commit is contained in:
ly303550688 2021-12-23 00:02:35 +08:00
parent a979f96bff
commit 2737175196
2 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
FreeSql.Tests/FreeSql.Tests/Internal/UtilsTest.cs Normal file
View File

@ -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());
}
}
}

8
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -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));
}
}