GithubStar/Dapper
1
0
Fork 0
mirror of https://github.com/DapperLib/Dapper.git synced 2026-10-23 09:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for types with constructors matching the types pulled by data reader.

Browse Source
This commit is contained in:
vosen
2012-03-02 15:37:15 +01:00
parent f97241e564
commit b73acfcecf
2 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dapper/SqlMapper.cs
+66 -24
View File
@@ -1497,6 +1497,7 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
int index = startBound;
ConstructorInfo specializedConstructor = null;
if (type.IsValueType)
{
il.Emit(OpCodes.Ldloca_S, (byte)1);
@@ -1504,19 +1505,39 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
}
else
{
var ctor = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Type.EmptyTypes, null);
if (ctor == null)
var types = new Type[length - startBound];
for (int i = startBound; i < startBound + length; i++)
{
throw new InvalidOperationException("A parameterless default constructor is required to allow for dapper materialization");
types[i - startBound] = reader.GetFieldType(i);
}
var ctorWithParameters = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, types, null);
if (ctorWithParameters != null)
{
var ctorParams = ctorWithParameters.GetParameters();
for(int i =0; i< ctorParams.Length; i++)
{
if (!String.Equals(ctorParams[i].Name, names[i], StringComparison.OrdinalIgnoreCase))
break;
specializedConstructor = ctorWithParameters;
}
}
if(specializedConstructor == null)
{
var ctor = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Type.EmptyTypes, null);
if (ctor == null)
{
throw new InvalidOperationException("A parameterless default constructor is required to allow for dapper materialization");
}
il.Emit(OpCodes.Newobj, ctor);
il.Emit(OpCodes.Stloc_1);
}
il.Emit(OpCodes.Newobj, ctor);
il.Emit(OpCodes.Stloc_1);
}
il.BeginExceptionBlock();
if(type.IsValueType)
{
il.Emit(OpCodes.Ldloca_S, (byte)1);// [target]
} else
}
else if(specializedConstructor == null)
{
il.Emit(OpCodes.Ldloc_1);// [target]
}
@@ -1529,7 +1550,8 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
{
if (item.Property != null || item.Field != null)
{
il.Emit(OpCodes.Dup); // stack is now [target][target]
if(specializedConstructor == null)
il.Emit(OpCodes.Dup); // stack is now [target][target]
Label isDbNullLabel = il.DefineLabel();
Label finishLabel = il.DefineLabel();
@@ -1587,13 +1609,16 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
{
il.Emit(OpCodes.Newobj, memberType.GetConstructor(new[] { nullUnderlyingType }));
}
if (item.Property != null)
if (specializedConstructor == null)
{
il.Emit(OpCodes.Callvirt, item.Property.Setter); // stack is now [target]
}
else
{
il.Emit(OpCodes.Stfld, item.Field); // stack is now [target]
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);
@@ -1614,28 +1639,41 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
il.Emit(OpCodes.Newobj, memberType.GetConstructor(new[] { nullUnderlyingType }));
}
}
if (item.Property != null)
if (specializedConstructor == null)
{
if (type.IsValueType)
if (item.Property != null)
{
il.Emit(OpCodes.Call, item.Property.Setter); // stack is now [target]
if (type.IsValueType)
{
il.Emit(OpCodes.Call, item.Property.Setter); // stack is now [target]
}
else
{
il.Emit(OpCodes.Callvirt, item.Property.Setter); // stack is now [target]
}
}
else
{
il.Emit(OpCodes.Callvirt, item.Property.Setter); // stack is now [target]
il.Emit(OpCodes.Stfld, item.Field); // stack is now [target]
}
}
else
{
il.Emit(OpCodes.Stfld, item.Field); // stack is now [target]
}
il.Emit(OpCodes.Br_S, finishLabel); // stack is now [target]
il.MarkLabel(isDbNullLabel); // incoming stack: [target][target][value]
il.Emit(OpCodes.Pop); // stack is now [target][target]
il.Emit(OpCodes.Pop); // stack is now [target]
if (specializedConstructor != null)
{
Type itemType = item.Property != null ? item.Property.Type : item.Field.FieldType;
if (itemType.IsValueType)
il.Emit(OpCodes.Initobj, itemType);
else
il.Emit(OpCodes.Ldnull);
}
else
{
il.Emit(OpCodes.Pop); // stack is now [target][target]
il.Emit(OpCodes.Pop); // stack is now [target]
}
if (first && returnNullIfFirstMissing)
{
@@ -1656,6 +1694,10 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
}
else
{
if (specializedConstructor != null)
{
il.Emit(OpCodes.Newobj, specializedConstructor);
}
il.Emit(OpCodes.Stloc_1); // stack is empty
}
il.MarkLabel(allDone);
Tests/Tests.cs
+5 -13
View File
@@ -33,29 +33,21 @@ namespace SqlMapper
}
}
class NoDefualtConstructor
class NoDefaultConstructor
{
public NoDefualtConstructor(int a)
public NoDefaultConstructor(int a)
{
A = a;
}
public int A { get; set; }
}
public void EnsureNoConstructorGivesNiceError()
public void TestNoDefaultConstructor()
{
try
{
connection.Query<NoDefualtConstructor>("select 1 A").First();
}
catch(InvalidOperationException e)
{
e.Message.IsEqualTo("A parameterless default constructor is required to allow for dapper materialization");
}
NoDefaultConstructor nodef = connection.Query<NoDefaultConstructor>("select 1 A").First();
nodef.A.IsEqualTo(1);
}
// http://stackoverflow.com/q/8593871
public void TestAbstractInheritance()
{