Skip to content

Commit 4e5aa12

Browse files
ThatRendleThatRendle
committed
Added tests for fixed issues
2 parents 6b677fa + d7a2c7a commit 4e5aa12

10 files changed

Lines changed: 68 additions & 58 deletions

File tree

‎CommonAssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121

2222
[assembly: AssemblyVersion("0.9.4.1")]
2323
[assembly: AssemblyFileVersion("0.9.4.1")]
24+

‎Simple.Data.Ado/Simple.Data.Ado.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Ado</id>
5-
<version>0.9.3.1</version>
5+
<version>0.9.3.2</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>ADO Adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Core" version="0.9.3.1" />
15+
<dependency id="Simple.Data.Core" version="0.9.3.2" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.Mocking/Simple.Data.Mocking.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.Mocking</id>
5-
<version>0.9.3.1</version>
5+
<version>0.9.3.2</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>XML-based Mocking adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>database data .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.3.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.3.2" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlCompact40</id>
5-
<version>0.9.3.1</version>
5+
<version>0.9.3.2</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver compact sqlce database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.3.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.3.2" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlCe40/SqlCeDbParameterFactory.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public class SqlCeDbParameterFactory : IDbParameterFactory
1212
public IDbDataParameter CreateParameter(string name, Column column)
1313
{
1414
var sqlCeColumn = (SqlCeColumn) column;
15-
return new SqlCeParameter(name, sqlCeColumn.SqlDbType, column.MaxLength, column.ActualName);
15+
16+
return new SqlCeParameter(name, sqlCeColumn.SqlDbType, 0, column.ActualName);
1617
}
1718

1819
public IDbDataParameter CreateParameter(string name, DbType dbType, int maxLength)

‎Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlServer</id>
5-
<version>0.9.3.1</version>
5+
<version>0.9.3.2</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.9.3.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.3.2" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlTest/FindTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ public void TestFindAllByName()
5454
Assert.AreEqual(1, users.Count());
5555
}
5656

57+
[Test]
58+
public void TestFindAllByNameAsIEnumerableOfDynamic()
59+
{
60+
var db = DatabaseHelper.Open();
61+
IEnumerable<dynamic> users = db.Users.FindAllByName("Bob");
62+
Assert.AreEqual(1, users.Count());
63+
}
64+
5765
[Test]
5866
public void TestFindAllByPartialName()
5967
{

‎Simple.Data.SqlTest/QueryTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public void WithTotalCountShouldGiveCount()
124124
Promise<int> count;
125125
var db = DatabaseHelper.Open();
126126
var list = db.PagingTest.QueryById(1.to(50))
127-
.WithTotalCount(out count)
128127
.Take(10)
128+
.WithTotalCount(out count)
129129
.ToList();
130130

131131
Assert.AreEqual(10, list.Count);

‎Simple.Data.SqlTest/SqlQueryPagerTest.cs‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Text.RegularExpressions;
6-
using NUnit.Framework;
7-
using Simple.Data.SqlServer;
8-
9-
namespace Simple.Data.SqlTest
10-
{
11-
[TestFixture]
12-
public class SqlQueryPagerTest
13-
{
14-
static readonly Regex Normalize = new Regex(@"\s+", RegexOptions.Multiline);
15-
16-
[Test]
17-
public void ShouldApplyPagingUsingOrderBy()
18-
{
19-
const string sql = "select a,b,c from d where a = 1 order by c";
20-
const string expected =
21-
"with __data as (select a,b,c, row_number() over(order by c) as [_#_] from d where a = 1)"
22-
+ " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
23-
24-
var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
25-
modified = Normalize.Replace(modified, " ").ToLowerInvariant();
26-
27-
Assert.AreEqual(expected, modified);
28-
}
29-
30-
[Test]
31-
public void ShouldApplyPagingUsingOrderByFirstColumnIfNotAlreadyOrdered()
32-
{
33-
const string sql = "select a,b,c from d where a = 1";
34-
const string expected =
35-
"with __data as (select a,b,c, row_number() over(order by a) as [_#_] from d where a = 1)"
36-
+ " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
37-
38-
var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
39-
modified = Normalize.Replace(modified, " ").ToLowerInvariant();
40-
41-
Assert.AreEqual(expected, modified);
42-
}
43-
44-
[Test]
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Text.RegularExpressions;
6+
using NUnit.Framework;
7+
using Simple.Data.SqlServer;
8+
9+
namespace Simple.Data.SqlTest
10+
{
11+
[TestFixture]
12+
public class SqlQueryPagerTest
13+
{
14+
static readonly Regex Normalize = new Regex(@"\s+", RegexOptions.Multiline);
15+
16+
[Test]
17+
public void ShouldApplyPagingUsingOrderBy()
18+
{
19+
const string sql = "select a,b,c from d where a = 1 order by c";
20+
const string expected =
21+
"with __data as (select a,b,c, row_number() over(order by c) as [_#_] from d where a = 1)"
22+
+ " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
23+
24+
var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
25+
modified = Normalize.Replace(modified, " ").ToLowerInvariant();
26+
27+
Assert.AreEqual(expected, modified);
28+
}
29+
30+
[Test]
31+
public void ShouldApplyPagingUsingOrderByFirstColumnIfNotAlreadyOrdered()
32+
{
33+
const string sql = "select a,b,c from d where a = 1";
34+
const string expected =
35+
"with __data as (select a,b,c, row_number() over(order by a) as [_#_] from d where a = 1)"
36+
+ " select a,b,c from __data where [_#_] between @skip + 1 and @skip + @take";
37+
38+
var modified = new SqlQueryPager().ApplyPaging(sql, "@skip", "@take");
39+
modified = Normalize.Replace(modified, " ").ToLowerInvariant();
40+
41+
Assert.AreEqual(expected, modified);
42+
}
43+
44+
[Test]
4545
public void ShouldCopeWithAliasedColumns()
4646
{
4747
const string sql = "select [a],[b] as [foo],[c] from [d] where [a] = 1";
@@ -53,6 +53,6 @@ public void ShouldCopeWithAliasedColumns()
5353
modified = Normalize.Replace(modified, " ").ToLowerInvariant();
5454

5555
Assert.AreEqual(expected, modified);
56-
}
57-
}
58-
}
56+
}
57+
}
58+
}

‎Simple.Data/Simple.Data.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Core</id>
5-
<version>0.9.3.1</version>
5+
<version>0.9.3.2</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>

0 commit comments

Comments
 (0)