Skip to content

D
Dapper

int / Dapper
11 个月 前同步成功

通知 2
Star 0
Fork 0
D
Dapper

体验新版 GitCode，发现更多精彩内容 >>

提交 05fe38d9 编写于 作者: S Sam Saffron
浏览文件
操作

merge

上级 da5c0a44 16a936cd
隐藏空白更改
内联 并排
Showing with 163 addition and 22 deletion
Dapper/SqlMapper.cs
浏览文件 @ 05fe38d9
......@@ -143,7 +143,7 @@ public override bool Equals(object obj)
private readonly int hashCode;
private readonly Type type;
private readonly string connectionString;
private readonly Type parametersType;
internal readonly Type parametersType;
public override int GetHashCode()
{
return hashCode;
......@@ -171,9 +171,49 @@ public bool Equals(Identity other)
#endif
)
{
var identity = new Identity(sql, cnn, null, param == null ? null : param.GetType(), null);
var info = GetCacheInfo(param, identity);
return ExecuteCommand(cnn, transaction, sql, info.ParamReader, param, commandTimeout, commandType);
IEnumerable multiExec = (object)param as IEnumerable;
Identity identity;
CacheInfo info;
if (multiExec != null && !(multiExec is string))
{ // we actually want a T from IEnumerable<T>
var interfaces = multiExec.GetType().GetInterfaces();
var openType = typeof(IEnumerable<>);
Type foundType = null;
for(int i = 0 ; i < interfaces.Length; i++)
{
if(interfaces[i].IsGenericType && interfaces[i].GetGenericTypeDefinition() == openType)
{ // implementing more than one T is self-inflicted
foundType = interfaces[i].GetGenericArguments()[0];
identity = new Identity(sql, cnn, null, foundType, null);
info = GetCacheInfo(identity);
using (var cmd = SetupCommand(cnn, transaction, sql, null, null, commandTimeout, commandType))
{
bool isFirst = true;
var masterSql = cmd.CommandText;
var reader = info.ParamReader;
int total = 0;
foreach (var obj in multiExec)
{
if (isFirst) { isFirst = false; }
else
{
cmd.CommandText = masterSql; // because we do magic replaces on "in" etc
cmd.Parameters.Clear(); // current code is Add-tastic
}
reader(cmd, obj);
total += cmd.ExecuteNonQuery();
}
return total;
}
}
}
}
// nice and simple
identity = new Identity(sql, cnn, null, (object)param == null ? null : ((object)param).GetType(), null);
info = GetCacheInfo(identity);
return ExecuteCommand(cnn, transaction, sql, info.ParamReader, (object)param, commandTimeout, commandType);
}
#if !CSHARP30
/// <summary>
......@@ -210,14 +250,14 @@ public static IEnumerable<dynamic> Query(this IDbConnection cnn, string sql, dyn
)
{
var identity = new Identity(sql, cnn, typeof(GridReader), param == null ? null : param.GetType(), null);
var info = GetCacheInfo(param, identity);
Identity identity = new Identity(sql, cnn, typeof(GridReader), (object)param == null ? null : ((object)param).GetType(), null);
CacheInfo info = GetCacheInfo(identity);
IDbCommand cmd = null;
IDataReader reader = null;
try
{
cmd = SetupCommand(cnn, transaction, sql, info.ParamReader, param, commandTimeout, commandType);
cmd = SetupCommand(cnn, transaction, sql, info.ParamReader, (object)param, commandTimeout, commandType);
reader = cmd.ExecuteReader();
return new GridReader(cmd, reader);
}
......@@ -235,7 +275,7 @@ public static IEnumerable<dynamic> Query(this IDbConnection cnn, string sql, dyn
private static IEnumerable<T> QueryInternal<T>(this IDbConnection cnn, string sql, object param, IDbTransaction transaction, int? commandTimeout, CommandType? commandType)
{
var identity = new Identity(sql, cnn, typeof(T), param == null ? null : param.GetType(), null);
var info = GetCacheInfo(param, identity);
var info = GetCacheInfo(identity);
using (var cmd = SetupCommand(cnn, transaction, sql, info.ParamReader, param, commandTimeout, commandType))
{
......@@ -319,10 +359,10 @@ class DontMap {}
static IEnumerable<TReturn> MultiMapImpl<TFirst, TSecond, TThird, TFourth, TFifth, TReturn>(this IDbConnection cnn, string sql, object map, object param, IDbTransaction transaction, string splitOn, int? commandTimeout, CommandType? commandType)
{
var identity = new Identity(sql, cnn, typeof(TFirst), param == null ? null : param.GetType(), new[] { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth) });
var info = GetCacheInfo(param, identity);
Identity identity = new Identity(sql, cnn, typeof(TFirst), (object)param == null ? null : ((object)param).GetType(), new[] { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth) });
CacheInfo info = GetCacheInfo(identity);
using (var cmd = SetupCommand(cnn, transaction, sql, info.ParamReader, param, commandTimeout, commandType))
using (var cmd = SetupCommand(cnn, transaction, sql, info.ParamReader, (object)param, commandTimeout, commandType))
{
using (var reader = cmd.ExecuteReader())
{
......@@ -435,23 +475,24 @@ class DontMap {}
}
}
private static CacheInfo GetCacheInfo(object param, Identity identity)
private static CacheInfo GetCacheInfo(Identity identity)
{
CacheInfo info;
if (!TryGetQueryCache(identity, out info))
{
info = new CacheInfo();
if (param != null)
if (identity.parametersType != null)
{
if (param is IDynamicParameters)
if (typeof(IDynamicParameters).IsAssignableFrom(identity.parametersType))
{
info.ParamReader = (cmd, obj) => { (obj as IDynamicParameters).AddParameter(cmd); };
}
else
{
info.ParamReader = CreateParamInfoGenerator(param.GetType());
info.ParamReader = CreateParamInfoGenerator(identity.parametersType);
}
}
SetQueryCache(identity, info);
}
return info;
}
......@@ -849,6 +890,11 @@ private static int ExecuteCommand(IDbConnection cnn, IDbTransaction tranaction,
return (T)val;
};
}
static readonly MethodInfo
enumParse = typeof(Enum).GetMethod("Parse", new Type[] { typeof(Type), typeof(string), typeof(bool) }),
getItem = typeof(IDataRecord).GetProperties(BindingFlags.Instance | BindingFlags.Public)
.Where(p => p.GetIndexParameters().Any() && p.GetIndexParameters()[0].ParameterType == typeof(int))
.Select(p => p.GetGetMethod()).First();
public static Func<IDataReader, T> GetClassDeserializer<T>(
#if CSHARP30
......@@ -863,6 +909,7 @@ private static int ExecuteCommand(IDbConnection cnn, IDbTransaction tranaction,
var il = dm.GetILGenerator();
il.DeclareLocal(typeof(int));
il.DeclareLocal(typeof(T));
bool haveEnumLocal = false;
il.Emit(OpCodes.Ldc_I4_0);
il.Emit(OpCodes.Stloc_0);
var properties = typeof(T)
......@@ -896,11 +943,6 @@ private static int ExecuteCommand(IDbConnection cnn, IDbTransaction tranaction,
select new { Name = n, Property = prop, Field = field }
).ToList();
var getItem = typeof(IDataRecord).GetProperties(BindingFlags.Instance | BindingFlags.Public)
.Where(p => p.GetIndexParameters().Any() && p.GetIndexParameters()[0].ParameterType == typeof(int))
.Select(p => p.GetGetMethod()).First();
int index = startBound;
il.BeginExceptionBlock();
......@@ -922,6 +964,7 @@ private static int ExecuteCommand(IDbConnection cnn, IDbTransaction tranaction,
il.Emit(OpCodes.Stloc_0);// stack is now [target][target][reader][index]
il.Emit(OpCodes.Callvirt, getItem); // stack is now [target][target][value-as-object]
il.Emit(OpCodes.Dup); // stack is now [target][target][value][value]
il.Emit(OpCodes.Isinst, typeof(DBNull)); // stack is now [target][target][value-as-object][DBNull or null]
il.Emit(OpCodes.Brtrue_S, isDbNullLabel); // stack is now [target][target][value-as-object]
......@@ -930,6 +973,50 @@ private static int ExecuteCommand(IDbConnection cnn, IDbTransaction tranaction,
Type memberType = item.Property != null ? item.Property.Type : item.Field.FieldType;
var nullUnderlyingType = Nullable.GetUnderlyingType(memberType);
var unboxType = nullUnderlyingType != null && nullUnderlyingType.IsEnum ? nullUnderlyingType : memberType;
if (unboxType.IsEnum)
{
if (!haveEnumLocal)
{
il.DeclareLocal(typeof(string));
haveEnumLocal = true;
}
Label isNotString = il.DefineLabel();
il.Emit(OpCodes.Dup); // stack is now [target][target][value][value]
il.Emit(OpCodes.Isinst, typeof(string)); // stack is now [target][target][value-as-object][string or null]
il.Emit(OpCodes.Dup);// stack is now [target][target][value-as-object][string or null][string or null]
il.Emit(OpCodes.Stloc_2); // stack is now [target][target][value-as-object][string or null]
il.Emit(OpCodes.Brfalse_S, isNotString); // stack is now [target][target][value-as-object]
il.Emit(OpCodes.Pop); // stack is now [target][target]
il.Emit(OpCodes.Ldtoken, unboxType); // stack is now [target][target][enum-type-token]
il.EmitCall(OpCodes.Call, typeof(Type).GetMethod("GetTypeFromHandle"), null);// stack is now [target][target][enum-type]
il.Emit(OpCodes.Ldloc_2); // stack is now [target][target][enum-type][string]
il.Emit(OpCodes.Ldc_I4_1); // stack is now [target][target][enum-type][string][true]
il.EmitCall(OpCodes.Call, enumParse, null); // stack is now [target][target][enum-as-object]
il.Emit(OpCodes.Unbox_Any, unboxType); // stack is now [target][target][typed-value]
if (nullUnderlyingType != null)
{
il.Emit(OpCodes.Newobj, memberType.GetConstructor(new[] { nullUnderlyingType }));
}
if (item.Property != null)
{
il.Emit(OpCodes.Callvirt, item.Property.Setter); // stack is now [target]
}
else
{
il.Emit(OpCodes.Stfld, item.Field); // stack is now [target]
}
il.Emit(OpCodes.Br_S, finishLabel);
il.MarkLabel(isNotString);
}
il.Emit(OpCodes.Unbox_Any, unboxType); // stack is now [target][target][typed-value]
if (nullUnderlyingType != null && nullUnderlyingType.IsEnum)
{
......@@ -1107,6 +1194,27 @@ class ParamInfo
public IDbDataParameter AttachedParam { get; set; }
}
public DynamicParameters() { }
public DynamicParameters(object template)
{
const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance;
if (template != null)
{
foreach (PropertyInfo prop in template.GetType().GetProperties(bindingFlags))
{
if (!prop.CanRead) continue;
var idx = prop.GetIndexParameters();
if (idx != null && idx.Length != 0) continue;
Add("@" + prop.Name, prop.GetValue(template, null), null, ParameterDirection.Input, null);
}
foreach (FieldInfo field in template.GetType().GetFields(bindingFlags))
{
Add("@" + field.Name, field.GetValue(template), null, ParameterDirection.Input, null);
}
}
}
public void Add(
#if CSHARP30
......
Tests/Tests.cs
浏览文件 @ 05fe38d9
......@@ -180,6 +180,21 @@ public void TestExecuteCommand()
set nocount on
drop table #t", new {a=1, b=2 }).IsEqualTo(2);
}
public void TestExecuteCommandWithHybridParameters()
{
var p = new DynamicParameters(new { a = 1, b = 2 });
p.Add("@c", dbType: DbType.Int32, direction: ParameterDirection.Output);
connection.Execute(@"set @c = @a + @b", p);
p.Get<int>("@c").IsEqualTo(3);
}
public void TestExecuteMultipleCommand()
{
connection.Execute("create table #t(i int)");
int tally = connection.Execute(@"insert #t (i) values(@a)", new[] { new { a = 1 }, new { a = 2 }, new { a = 3 }, new { a = 4 } });
int sum = connection.Query<int>("select sum(i) from #t drop table #t").First();
tally.IsEqualTo(4);
sum.IsEqualTo(10);
}
public void TestMassiveStrings()
{
......@@ -528,10 +543,28 @@ class TestEnumClass
{
public TestEnum? EnumEnum { get; set; }
}
class TestEnumClassNoNull
{
public TestEnum EnumEnum { get; set; }
}
public void TestEnumWeirdness()
{
connection.Query<TestEnumClass>("select null as [EnumEnum]");
connection.Query<TestEnumClass>("select cast(1 as tinyint) as [EnumEnum]");
connection.Query<TestEnumClass>("select null as [EnumEnum]").First().EnumEnum.IsEqualTo(null);
connection.Query<TestEnumClass>("select cast(1 as tinyint) as [EnumEnum]").First().EnumEnum.IsEqualTo(TestEnum.Bla);
}
void Foo()
{
string s = "Bla";
var obj = new TestEnumClassNoNull();
obj.EnumEnum = (TestEnum)Enum.Parse(typeof(TestEnum), s, true);
}
public void TestEnumStrings()
{
connection.Query<TestEnumClassNoNull>("select 'BLA' as [EnumEnum]").First().EnumEnum.IsEqualTo(TestEnum.Bla);
connection.Query<TestEnumClassNoNull>("select 'bla' as [EnumEnum]").First().EnumEnum.IsEqualTo(TestEnum.Bla);
connection.Query<TestEnumClass>("select 'BLA' as [EnumEnum]").First().EnumEnum.IsEqualTo(TestEnum.Bla);
connection.Query<TestEnumClass>("select 'bla' as [EnumEnum]").First().EnumEnum.IsEqualTo(TestEnum.Bla);
}
public void TestSupportForParamDictionary()
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或