Skip to content

Commit 96e888a

Browse files
ThatRendleThatRendle
committed
Fixed Issue 74 - fail with explicit Select and WithTotalCount
1 parent 55b474d commit 96e888a

13 files changed

Lines changed: 352 additions & 294 deletions

File tree

‎CommonAssemblyInfo.cs‎

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

22-
[assembly: AssemblyVersion("0.9.0.1")]
23-
[assembly: AssemblyFileVersion("0.9.0.1")]
22+
[assembly: AssemblyVersion("0.9.2.1")]
23+
[assembly: AssemblyFileVersion("0.9.2.1")]

‎Simple.Data.Ado/AdoAdapter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private IEnumerable<IDictionary<string, object>> RunQueryWithCount(SimpleQuery q
116116
throw new InvalidOperationException("No WithCountClause specified.");
117117
}
118118

119-
var countQuery = query.ClearSkip().ClearTake().Select(new CountSpecialReference());
119+
var countQuery = query.ClearSkip().ClearTake().ReplaceSelect(new CountSpecialReference());
120120
var unhandledClausesList = new List<IEnumerable<SimpleQueryClauseBase>> { Enumerable.Empty<SimpleQueryClauseBase>(), Enumerable.Empty<SimpleQueryClauseBase>() };
121121
using (var enumerator = RunQueries(new[] { countQuery, query }, unhandledClausesList).GetEnumerator())
122122
{

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

‎Simple.Data.BehaviourTest/Query/WithCountTest.cs‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void WithTotalCountShouldCreateCompoundQuery_ObsoleteFutureVersion()
3333

3434
GeneratedSqlIs(expected);
3535
}
36+
3637
[Test]
3738
public void WithTotalCountShouldCreateCompoundQuery()
3839
{
@@ -46,6 +47,22 @@ public void WithTotalCountShouldCreateCompoundQuery()
4647
EatException<InvalidOperationException>(() => q.ToList());
4748

4849
GeneratedSqlIs(expected);
49-
}
50+
}
51+
52+
[Test]
53+
public void WithTotalCountWithExplicitSelectShouldCreateCompoundQuery()
54+
{
55+
const string expected = @"select count(*) from [dbo].[users] where [dbo].[users].[name] = @p1_c0; " +
56+
@"select [dbo].[users].[name] from [dbo].[users] where [dbo].[users].[name] = @p1_c1";
57+
58+
Promise<int> count;
59+
var q = _db.Users.QueryByName("Foo")
60+
.Select(_db.Users.Name)
61+
.WithTotalCount(out count);
62+
63+
EatException<InvalidOperationException>(() => q.ToList());
64+
65+
GeneratedSqlIs(expected);
66+
}
5067
}
5168
}

0 commit comments

Comments
 (0)