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
7c48f046
Commit
7c48f046
authored
Jun 12, 2019
by
mgravell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tests - removed MSSQLCLIENT for now
parent
07976041
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
96 additions
and
1 deletion
+96
-1
AsyncTests.cs
Dapper.Tests/AsyncTests.cs
+4
-0
ConstructorTests.cs
Dapper.Tests/ConstructorTests.cs
+2
-0
Dapper.Tests.csproj
Dapper.Tests/Dapper.Tests.csproj
+8
-1
DataReaderTests.cs
Dapper.Tests/DataReaderTests.cs
+2
-0
DecimalTests.cs
Dapper.Tests/DecimalTests.cs
+2
-0
EnumTests.cs
Dapper.Tests/EnumTests.cs
+2
-0
LiteralTests.cs
Dapper.Tests/LiteralTests.cs
+2
-0
MiscTests.cs
Dapper.Tests/MiscTests.cs
+2
-0
MultiMapTests.cs
Dapper.Tests/MultiMapTests.cs
+2
-0
NullTests.cs
Dapper.Tests/NullTests.cs
+2
-0
ParameterTests.cs
Dapper.Tests/ParameterTests.cs
+2
-0
ProcedureTests.cs
Dapper.Tests/ProcedureTests.cs
+2
-0
EntityFrameworkTests.cs
Dapper.Tests/Providers/EntityFrameworkTests.cs
+2
-0
Linq2SqlTests.cs
Dapper.Tests/Providers/Linq2SqlTests.cs
+2
-0
MySQLTests.cs
Dapper.Tests/Providers/MySQLTests.cs
+48
-0
QueryMultipleTests.cs
Dapper.Tests/QueryMultipleTests.cs
+2
-0
TestBase.cs
Dapper.Tests/TestBase.cs
+2
-0
TransactionTests.cs
Dapper.Tests/TransactionTests.cs
+2
-0
TupleTests.cs
Dapper.Tests/TupleTests.cs
+2
-0
TypeHandlerTests.cs
Dapper.Tests/TypeHandlerTests.cs
+2
-0
XmlTests.cs
Dapper.Tests/XmlTests.cs
+2
-0
No files found.
Dapper.Tests/AsyncTests.cs
View file @
7c48f046
...
...
@@ -11,13 +11,17 @@ namespace Dapper.Tests
{
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
SystemSqlClientAsyncTests
:
AsyncTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
MicrosoftSqlClientAsyncTests
:
AsyncTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
SystemSqlClientAsyncQueryCacheTests
:
AsyncQueryCacheTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
MicrosoftSqlClientAsyncQueryCacheTests
:
AsyncQueryCacheTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
AsyncTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
SqlServerDatabaseProvider
...
...
Dapper.Tests/ConstructorTests.cs
View file @
7c48f046
...
...
@@ -6,7 +6,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientConstructorTests
:
ConstructorTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientConstructorTests
:
ConstructorTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
ConstructorTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
...
...
Dapper.Tests/Dapper.Tests.csproj
View file @
7c48f046
...
...
@@ -16,6 +16,14 @@
<ItemGroup>
<None Remove="Test.DB.sdf" />
</ItemGroup>
<!-- these two go together
<PropertyGroup>
<DefineConstants>$(DefineConstants);MSSQLCLIENT</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19128.1-Preview" />
</ItemGroup>
-->
<ItemGroup>
<ProjectReference Include="..\Dapper\Dapper.csproj" />
<ProjectReference Include="..\Dapper.Contrib\Dapper.Contrib.csproj" />
...
...
@@ -26,7 +34,6 @@
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="xunit" Version="$(xUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitVersion)" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19128.1-Preview" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
</ItemGroup>
...
...
Dapper.Tests/DataReaderTests.cs
View file @
7c48f046
...
...
@@ -5,7 +5,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientDataReaderTests
:
DataReaderTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientDataReaderTests
:
DataReaderTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
DataReaderTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
...
...
Dapper.Tests/DecimalTests.cs
View file @
7c48f046
...
...
@@ -6,7 +6,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientDecimalTests
:
DecimalTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientDecimalTests
:
DecimalTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
DecimalTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/EnumTests.cs
View file @
7c48f046
...
...
@@ -5,7 +5,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientEnumTests
:
EnumTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientEnumTests
:
EnumTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
EnumTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/LiteralTests.cs
View file @
7c48f046
...
...
@@ -4,7 +4,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientLiteralTests
:
LiteralTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientLiteralTests
:
LiteralTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
LiteralTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/MiscTests.cs
View file @
7c48f046
...
...
@@ -40,7 +40,9 @@ public GenericUriParser(GenericUriParserOptions options)
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientMiscTests
:
MiscTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientMiscTests
:
MiscTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
MiscTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/MultiMapTests.cs
View file @
7c48f046
...
...
@@ -7,7 +7,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientMultiMapTests
:
MultiMapTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientMultiMapTests
:
MultiMapTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
MultiMapTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/NullTests.cs
View file @
7c48f046
...
...
@@ -4,8 +4,10 @@ namespace Dapper.Tests
{
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
SystemSqlClientNullTests
:
NullTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
MicrosoftSqlClientNullTests
:
NullTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
NullTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
...
...
Dapper.Tests/ParameterTests.cs
View file @
7c48f046
...
...
@@ -20,8 +20,10 @@ namespace Dapper.Tests
{
[
Collection
(
NonParallelDefinition
.
Name
)]
// because it creates SQL types that compete between the two providers
public
sealed
class
SystemSqlClientParameterTests
:
ParameterTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
[
Collection
(
NonParallelDefinition
.
Name
)]
// because it creates SQL types that compete between the two providers
public
sealed
class
MicrosoftSqlClientParameterTests
:
ParameterTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
ParameterTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
public
class
DbParams
:
SqlMapper
.
IDynamicParameters
,
IEnumerable
<
IDbDataParameter
>
...
...
Dapper.Tests/ProcedureTests.cs
View file @
7c48f046
...
...
@@ -7,7 +7,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientProcedureTests
:
ProcedureTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientProcedureTests
:
ProcedureTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
ProcedureTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/Providers/EntityFrameworkTests.cs
View file @
7c48f046
...
...
@@ -7,7 +7,9 @@
namespace
Dapper.Tests.Providers
{
public
sealed
class
SystemSqlClientEntityFrameworkTests
:
EntityFrameworkTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientEntityFrameworkTests
:
EntityFrameworkTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
[
Collection
(
"TypeHandlerTests"
)]
public
abstract
class
EntityFrameworkTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
...
...
Dapper.Tests/Providers/Linq2SqlTests.cs
View file @
7c48f046
...
...
@@ -9,7 +9,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientLinq2SqlTests
:
Linq2SqlTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientLinq2SqlTests
:
Linq2SqlTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
Linq2SqlTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/Providers/MySQLTests.cs
View file @
7c48f046
using
System
;
using
System.Data
;
using
System.Data.Common
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Xunit
;
namespace
Dapper.Tests
...
...
@@ -155,6 +157,52 @@ public void SO36303462_Tinyint_Bools()
}
}
[
Fact
]
public
void
Issue1277_ReaderSync
()
{
using
(
var
conn
=
Provider
.
GetMySqlConnection
())
{
try
{
conn
.
Execute
(
"drop table Issue1277_Test"
);
}
catch
{
/* don't care */
}
conn
.
Execute
(
"create table Issue1277_Test (Id int not null, IsBold tinyint not null);"
);
conn
.
Execute
(
"insert Issue1277_Test (Id, IsBold) values (1,1);"
);
conn
.
Execute
(
"insert Issue1277_Test (Id, IsBold) values (2,0);"
);
conn
.
Execute
(
"insert Issue1277_Test (Id, IsBold) values (3,1);"
);
using
(
var
reader
=
conn
.
ExecuteReader
(
"select * from Issue1277_Test where Id < @id"
,
new
{
id
=
42
}))
{
var
table
=
new
DataTable
();
table
.
Load
(
reader
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
3
,
table
.
Rows
.
Count
);
}
}
}
[
Fact
]
public
async
Task
Issue1277_ReaderAsync
()
{
using
(
var
conn
=
Provider
.
GetMySqlConnection
())
{
try
{
await
conn
.
ExecuteAsync
(
"drop table Issue1277_Test"
);
}
catch
{
/* don't care */
}
await
conn
.
ExecuteAsync
(
"create table Issue1277_Test (Id int not null, IsBold tinyint not null);"
);
await
conn
.
ExecuteAsync
(
"insert Issue1277_Test (Id, IsBold) values (1,1);"
);
await
conn
.
ExecuteAsync
(
"insert Issue1277_Test (Id, IsBold) values (2,0);"
);
await
conn
.
ExecuteAsync
(
"insert Issue1277_Test (Id, IsBold) values (3,1);"
);
using
(
var
reader
=
await
conn
.
ExecuteReaderAsync
(
"select * from Issue1277_Test where Id < @id"
,
new
{
id
=
42
}))
{
var
table
=
new
DataTable
();
table
.
Load
(
reader
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
3
,
table
.
Rows
.
Count
);
}
}
}
private
class
SO36303462
{
public
int
Id
{
get
;
set
;
}
...
...
Dapper.Tests/QueryMultipleTests.cs
View file @
7c48f046
...
...
@@ -7,7 +7,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientQueryMultipleTests
:
QueryMultipleTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientQueryMultipleTests
:
QueryMultipleTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
QueryMultipleTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/TestBase.cs
View file @
7c48f046
...
...
@@ -72,10 +72,12 @@ public sealed class SystemSqlClientProvider : SqlServerDatabaseProvider
{
public
override
DbProviderFactory
Factory
=>
System
.
Data
.
SqlClient
.
SqlClientFactory
.
Instance
;
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientProvider
:
SqlServerDatabaseProvider
{
public
override
DbProviderFactory
Factory
=>
Microsoft
.
Data
.
SqlClient
.
SqlClientFactory
.
Instance
;
}
#endif
public
abstract
class
TestBase
<
TProvider
>
:
IDisposable
where
TProvider
:
DatabaseProvider
{
...
...
Dapper.Tests/TransactionTests.cs
View file @
7c48f046
...
...
@@ -8,7 +8,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientTransactionTests
:
TransactionTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientTransactionTests
:
TransactionTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
TransactionTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/TupleTests.cs
View file @
7c48f046
...
...
@@ -4,7 +4,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientTupleTests
:
TupleTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientTupleTests
:
TupleTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
TupleTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
Dapper.Tests/TypeHandlerTests.cs
View file @
7c48f046
...
...
@@ -10,8 +10,10 @@ namespace Dapper.Tests
{
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
SystemSqlClientTypeHandlerTests
:
TypeHandlerTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
[
Collection
(
NonParallelDefinition
.
Name
)]
public
sealed
class
MicrosoftSqlClientTypeHandlerTests
:
TypeHandlerTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
TypeHandlerTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
...
...
Dapper.Tests/XmlTests.cs
View file @
7c48f046
...
...
@@ -5,7 +5,9 @@
namespace
Dapper.Tests
{
public
sealed
class
SystemSqlClientXmlTests
:
XmlTests
<
SystemSqlClientProvider
>
{
}
#if MSSQLCLIENT
public
sealed
class
MicrosoftSqlClientXmlTests
:
XmlTests
<
MicrosoftSqlClientProvider
>
{
}
#endif
public
abstract
class
XmlTests
<
TProvider
>
:
TestBase
<
TProvider
>
where
TProvider
:
DatabaseProvider
{
[
Fact
]
...
...
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