Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
Dapper
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
Dapper
Commits
92d1fbe5
Commit
92d1fbe5
authored
Oct 04, 2012
by
Marc Gravell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix list handling when using dynamic parameters; see
http://stackoverflow.com/q/12723922/23354
parent
7910f25b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
82 additions
and
32 deletions
+82
-32
SqlMapper.cs
Dapper/SqlMapper.cs
+48
-31
Program.cs
Tests/Program.cs
+6
-1
Tests.cs
Tests/Tests.cs
+28
-0
No files found.
Dapper/SqlMapper.cs
View file @
92d1fbe5
...
...
@@ -408,7 +408,7 @@ static SqlMapper()
}
internal
const
string
LinqBinary
=
"System.Data.Linq.Binary"
;
private
static
DbType
LookupDbType
(
Type
type
,
string
name
)
internal
static
DbType
LookupDbType
(
Type
type
,
string
name
)
{
DbType
dbType
;
var
nullUnderlyingType
=
Nullable
.
GetUnderlyingType
(
type
);
...
...
@@ -1394,7 +1394,7 @@ public static IDbDataParameter FindOrAddParameter(IDataParameterCollection param
/// Internal use only
/// </summary>
[
Browsable
(
false
),
EditorBrowsable
(
EditorBrowsableState
.
Never
)]
[
Obsolete
(
"This method is for internal usage only"
,
tru
e
)]
[
Obsolete
(
"This method is for internal usage only"
,
fals
e
)]
public
static
void
PackListParameters
(
IDbCommand
command
,
string
namePrefix
,
object
value
)
{
// initially we tried TVP, however it performs quite poorly.
...
...
@@ -2572,41 +2572,58 @@ protected void AddParameters(IDbCommand command, SqlMapper.Identity identity)
foreach
(
var
param
in
parameters
.
Values
)
{
var
dbType
=
param
.
DbType
;
var
val
=
param
.
Value
;
string
name
=
Clean
(
param
.
Name
);
bool
add
=
!
command
.
Parameters
.
Contains
(
name
);
IDbDataParameter
p
;
if
(
add
)
{
p
=
command
.
CreateParameter
();
p
.
ParameterName
=
name
;
}
else
{
p
=
(
IDbDataParameter
)
command
.
Parameters
[
name
];
if
(
dbType
==
null
&&
val
!=
null
)
dbType
=
SqlMapper
.
LookupDbType
(
val
.
GetType
(),
name
);
if
(
dbType
==
DbType
.
Xml
)
{
// actually represents "in" lists
#pragma warning disable 612, 618
SqlMapper
.
PackListParameters
(
command
,
name
,
val
);
#pragma warning restore 612, 618
}
var
val
=
param
.
Value
;
p
.
Value
=
val
??
DBNull
.
Value
;
p
.
Direction
=
param
.
ParameterDirection
;
var
s
=
val
as
string
;
if
(
s
!=
null
)
else
{
if
(
s
.
Length
<=
4000
)
bool
add
=
!
command
.
Parameters
.
Contains
(
name
);
IDbDataParameter
p
;
if
(
add
)
{
p
.
Size
=
4000
;
p
=
command
.
CreateParameter
();
p
.
ParameterName
=
name
;
}
else
{
p
=
(
IDbDataParameter
)
command
.
Parameters
[
name
];
}
p
.
Value
=
val
??
DBNull
.
Value
;
p
.
Direction
=
param
.
ParameterDirection
;
var
s
=
val
as
string
;
if
(
s
!=
null
)
{
if
(
s
.
Length
<=
4000
)
{
p
.
Size
=
4000
;
}
}
if
(
param
.
Size
!=
null
)
{
p
.
Size
=
param
.
Size
.
Value
;
}
if
(
dbType
!=
null
)
{
p
.
DbType
=
dbType
.
Value
;
}
if
(
add
)
{
command
.
Parameters
.
Add
(
p
);
}
param
.
AttachedParam
=
p
;
}
if
(
param
.
Size
!=
null
)
{
p
.
Size
=
param
.
Size
.
Value
;
}
if
(
param
.
DbType
!=
null
)
{
p
.
DbType
=
param
.
DbType
.
Value
;
}
if
(
add
)
{
command
.
Parameters
.
Add
(
p
);
}
param
.
AttachedParam
=
p
;
}
}
...
...
Tests/Program.cs
View file @
92d1fbe5
...
...
@@ -122,7 +122,12 @@ private static void RunTests()
{
method
.
Invoke
(
tester
,
null
);
Console
.
WriteLine
(
" - OK!"
);
}
catch
(
Exception
ex
)
}
catch
(
TargetInvocationException
tie
)
{
fail
++;
Console
.
WriteLine
(
" - "
+
tie
.
InnerException
.
Message
);
}
catch
(
Exception
ex
)
{
fail
++;
Console
.
WriteLine
(
" - "
+
ex
.
Message
);
...
...
Tests/Tests.cs
View file @
92d1fbe5
...
...
@@ -1598,6 +1598,34 @@ public void TestAppendingAList()
result
[
2
].
IsEqualTo
(
3
);
}
public
void
TestAppendingAListAsDictionary
()
{
DynamicParameters
p
=
new
DynamicParameters
();
var
list
=
new
int
[]
{
1
,
2
,
3
};
var
args
=
new
Dictionary
<
string
,
object
>();
args
.
Add
(
"ids"
,
list
);
p
.
AddDynamicParams
(
args
);
var
result
=
connection
.
Query
<
int
>(
"select * from (select 1 A union all select 2 union all select 3) X where A in @ids"
,
p
).
ToList
();
result
[
0
].
IsEqualTo
(
1
);
result
[
1
].
IsEqualTo
(
2
);
result
[
2
].
IsEqualTo
(
3
);
}
public
void
TestAppendingAListByName
()
{
DynamicParameters
p
=
new
DynamicParameters
();
var
list
=
new
int
[]
{
1
,
2
,
3
};
p
.
Add
(
"ids"
,
list
);
var
result
=
connection
.
Query
<
int
>(
"select * from (select 1 A union all select 2 union all select 3) X where A in @ids"
,
p
).
ToList
();
result
[
0
].
IsEqualTo
(
1
);
result
[
1
].
IsEqualTo
(
2
);
result
[
2
].
IsEqualTo
(
3
);
}
public
void
TestUniqueIdentifier
()
{
var
guid
=
Guid
.
NewGuid
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment