Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Dapper
提交
d27a5ed3
D
Dapper
项目概览
int
/
Dapper
大约 1 年 前同步成功
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Dapper
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d27a5ed3
编写于
7月 19, 2011
作者:
M
mgravell
浏览文件
操作
浏览文件
下载
差异文件
Automated merge with
https://dapper-dot-net.googlecode.com/hg/
上级
6293045a
4fa4705c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
10 deletion
+33
-10
Dapper NET35/Dapper NET35.csproj
Dapper NET35/Dapper NET35.csproj
+1
-0
Dapper/Dapper.csproj
Dapper/Dapper.csproj
+1
-0
Dapper/SqlMapper.cs
Dapper/SqlMapper.cs
+20
-2
Tests/Tests.cs
Tests/Tests.cs
+11
-8
未找到文件。
Dapper NET35/Dapper NET35.csproj
浏览文件 @
d27a5ed3
...
...
@@ -36,6 +36,7 @@
<Reference
Include=
"System"
/>
<Reference
Include=
"System.Core"
/>
<Reference
Include=
"System.Data"
/>
<Reference
Include=
"System.Data.Linq"
/>
</ItemGroup>
<ItemGroup>
<Compile
Include=
"..\Dapper\Properties\AssemblyInfo.cs"
>
...
...
Dapper/Dapper.csproj
浏览文件 @
d27a5ed3
...
...
@@ -36,6 +36,7 @@
<Reference
Include=
"System.Core"
/>
<Reference
Include=
"Microsoft.CSharp"
/>
<Reference
Include=
"System.Data"
/>
<Reference
Include=
"System.Data.Linq"
/>
</ItemGroup>
<ItemGroup>
<Compile
Include=
"SqlMapper.cs"
/>
...
...
Dapper/SqlMapper.cs
浏览文件 @
d27a5ed3
...
...
@@ -183,6 +183,7 @@ static SqlMapper()
typeMap
[
typeof
(
Guid
?).
TypeHandle
]
=
DbType
.
Guid
;
typeMap
[
typeof
(
DateTime
?).
TypeHandle
]
=
DbType
.
DateTime
;
typeMap
[
typeof
(
DateTimeOffset
?).
TypeHandle
]
=
DbType
.
DateTimeOffset
;
typeMap
[
typeof
(
System
.
Data
.
Linq
.
Binary
).
TypeHandle
]
=
DbType
.
Binary
;
}
private
static
DbType
LookupDbType
(
Type
type
,
string
name
)
...
...
@@ -702,7 +703,7 @@ private static CacheInfo GetCacheInfo(Identity identity)
}
#endif
if
(
type
.
IsClass
&&
type
!=
typeof
(
string
)
&&
type
!=
typeof
(
byte
[]))
if
(
type
.
IsClass
&&
type
!=
typeof
(
string
)
&&
type
!=
typeof
(
byte
[])
&&
type
!=
typeof
(
System
.
Data
.
Linq
.
Binary
)
)
{
return
GetClassDeserializer
<
T
>(
reader
,
startBound
,
length
,
returnNullIfFirstMissing
);
}
...
...
@@ -1065,6 +1066,10 @@ private static IEnumerable<PropertyInfo> FilterParameters(IEnumerable<PropertyIn
il
.
MarkLabel
(
lenDone
);
il
.
Emit
(
OpCodes
.
Stloc_1
);
// [string]
}
if
(
prop
.
PropertyType
==
typeof
(
System
.
Data
.
Linq
.
Binary
))
{
il
.
EmitCall
(
OpCodes
.
Callvirt
,
typeof
(
System
.
Data
.
Linq
.
Binary
).
GetMethod
(
"ToArray"
,
BindingFlags
.
Public
|
BindingFlags
.
Instance
),
null
);
}
if
(
allDone
!=
null
)
il
.
MarkLabel
(
allDone
.
Value
);
// relative stack [boxed value or DBNull]
}
...
...
@@ -1132,6 +1137,10 @@ private static int ExecuteCommand(IDbConnection cnn, IDbTransaction tranaction,
{
return
(
Func
<
IDataReader
,
T
>)(
object
)
new
Func
<
IDataReader
,
char
?>(
r
=>
SqlMapper
.
ReadNullableChar
(
r
.
GetValue
(
index
)));
}
if
(
typeof
(
T
)
==
typeof
(
System
.
Data
.
Linq
.
Binary
))
{
return
(
Func
<
IDataReader
,
T
>)(
object
)
new
Func
<
IDataReader
,
System
.
Data
.
Linq
.
Binary
>(
r
=>
new
System
.
Data
.
Linq
.
Binary
((
byte
[])
r
.
GetValue
(
index
)));
}
#pragma warning restore 618
return
r
=>
{
...
...
@@ -1303,7 +1312,15 @@ static List<FieldInfo> GetSettableFields(Type t)
il
.
MarkLabel
(
isNotString
);
}
il
.
Emit
(
OpCodes
.
Unbox_Any
,
unboxType
);
// stack is now [target][target][typed-value]
if
(
memberType
==
typeof
(
System
.
Data
.
Linq
.
Binary
))
{
il
.
Emit
(
OpCodes
.
Unbox_Any
,
typeof
(
byte
[]));
// stack is now [target][target][byte-array]
il
.
Emit
(
OpCodes
.
Newobj
,
typeof
(
System
.
Data
.
Linq
.
Binary
).
GetConstructor
(
new
Type
[]
{
typeof
(
byte
[])
}));
// stack is now [target][target][binary]
}
else
{
il
.
Emit
(
OpCodes
.
Unbox_Any
,
unboxType
);
// stack is now [target][target][typed-value]
}
if
(
nullUnderlyingType
!=
null
&&
nullUnderlyingType
.
IsEnum
)
{
il
.
Emit
(
OpCodes
.
Newobj
,
memberType
.
GetConstructor
(
new
[]
{
nullUnderlyingType
}));
...
...
@@ -1317,6 +1334,7 @@ static List<FieldInfo> GetSettableFields(Type t)
{
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]
...
...
Tests/Tests.cs
浏览文件 @
d27a5ed3
...
...
@@ -1037,21 +1037,24 @@ public void TestDynamicParamNullSupport()
p
.
Get
<
int
?>(
"@b"
).
IsNull
();
}
class
Foo1
{
public
int
Id
;
public
int
BarId
{
get
;
set
;
}
var
input
=
new
System
.
Data
.
Linq
.
Binary
(
orig
);
var
output
=
connection
.
Query
<
WithBinary
>(
"select @input as [Value]"
,
new
{
input
}).
First
().
Value
;
output
.
ToArray
().
IsSequenceEqualTo
(
orig
);
}
class
Bar1
{
public
int
BarId
;
public
string
Name
{
get
;
set
;
}
var
input
=
new
System
.
Data
.
Linq
.
Binary
(
orig
);
var
output
=
connection
.
Query
<
System
.
Data
.
Linq
.
Binary
>(
"select @input as [Value]"
,
new
{
input
}).
First
();
output
.
ToArray
().
IsSequenceEqualTo
(
orig
);
}
public
void
TestMultiMapperIsNotConfusedWithUnorderedCols
()
{
public
System
.
Data
.
Linq
.
Binary
Value
{
get
;
set
;
}
var
result
=
connection
.
Query
<
Foo1
,
Bar1
,
Tuple
<
Foo1
,
Bar1
>>(
"select 1 as Id, 2 as BarId, 3 as BarId, 'a' as Name"
,
(
f
,
b
)
=>
Tuple
.
Create
(
f
,
b
),
splitOn
:
"BarId"
).
First
();
result
.
Item1
.
Id
.
IsEqualTo
(
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录