Skip to content

Commit 6d4105d

Browse files
ThatRendleThatRendle
committed
Fixed Paging + OrderBy issue; 0.9.6.2
1 parent 18d23d0 commit 6d4105d

File tree

9 files changed

+38
-12
lines changed

9 files changed

+38
-12
lines changed

‎CommonAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22-
[assembly: AssemblyVersion("0.9.6.1")]
23-
[assembly: AssemblyFileVersion("0.9.6.1")]
22+
[assembly: AssemblyVersion("0.9.6.2")]
23+
[assembly: AssemblyFileVersion("0.9.6.2")]
2424

‎Simple.Data.Ado/AdoAdapter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private IEnumerable<IDictionary<string, object>> RunQueryWithCount(SimpleQuery q
117117
}
118118

119119
query = query.ClearWithTotalCount();
120-
var countQuery = query.ClearSkip().ClearTake().ReplaceSelect(new CountSpecialReference());
120+
var countQuery = query.ClearSkip().ClearTake().ClearOrderBy().ReplaceSelect(new CountSpecialReference());
121121
var unhandledClausesList = new List<IEnumerable<SimpleQueryClauseBase>>
122122
{
123123
Enumerable.Empty<SimpleQueryClauseBase>(),

‎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.6.1</version>
5+
<version>0.9.6.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.6.1" />
15+
<dependency id="Simple.Data.Core" version="0.9.6.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.6.1</version>
5+
<version>0.9.6.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.6.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.6.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.6.1</version>
5+
<version>0.9.6.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.6.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.6.2" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎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.6.1</version>
5+
<version>0.9.6.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.6.1" />
15+
<dependency id="Simple.Data.Ado" version="0.9.6.2" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlTest/QueryTest.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,27 @@ public void WithTotalCountWithExplicitSelectShouldGiveCount()
153153
}
154154
}
155155

156+
[Test]
157+
public void WithTotalCountWithExplicitSelectAndOrderByShouldGiveCount()
158+
{
159+
Promise<int> count;
160+
var db = DatabaseHelper.Open();
161+
List<dynamic> list = db.PagingTest.QueryById(1.to(50))
162+
.Select(db.PagingTest.Id)
163+
.OrderByDescending(db.PagingTest.Id)
164+
.WithTotalCount(out count)
165+
.Take(10)
166+
.ToList();
167+
168+
Assert.IsTrue(count.HasValue);
169+
Assert.AreEqual(50, count);
170+
Assert.AreEqual(10, list.Count);
171+
foreach (var dictionary in list.Cast<IDictionary<string, object>>())
172+
{
173+
Assert.AreEqual(1, dictionary.Count);
174+
}
175+
}
176+
156177
[Test]
157178
public void WithTotalCountShouldGiveCount_ObsoleteFutureVersion()
158179
{

‎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.6.1</version>
5+
<version>0.9.6.2</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>

‎Simple.Data/SimpleQuery.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,5 +607,10 @@ public Task<IEnumerable<dynamic>> RunTask()
607607
{
608608
return Task.Factory.StartNew<IEnumerable<dynamic>>(Run);
609609
}
610+
611+
public SimpleQuery ClearOrderBy()
612+
{
613+
return new SimpleQuery(this, _clauses.Where(c => !(c is OrderByClause)).ToArray());
614+
}
610615
}
611616
}

0 commit comments

Comments
 (0)