Don't use ApplyLimit with With clauses

ThatRendle · ThatRendle · commit 4583cee0cc95 · 2012-08-30T00:26:56.000+01:00
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -19,6 +19,6 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("0.17.1.1")]
-[assembly: AssemblyFileVersion("0.17.1.1")]
+[assembly: AssemblyVersion("0.18.0.0")]
+[assembly: AssemblyFileVersion("0.18.0.0")]
 
diff --git a/Simple.Data.Ado/AdoAdapterQueryRunner.cs b/Simple.Data.Ado/AdoAdapterQueryRunner.cs
@@ -151,7 +151,7 @@ private ICommandBuilder[] GetPagedQueryCommandBuilders(ref SimpleQuery query, In
                 }
                 else
                 {
-                    ApplyPaging(commandBuilders, mainCommandBuilder, skipClause, takeClause, queryPager);
+                    ApplyPaging(commandBuilders, mainCommandBuilder, skipClause, takeClause, query.Clauses.OfType<WithClause>().Any(), queryPager);
                 }
             }
             return commandBuilders.ToArray();
@@ -168,21 +168,20 @@ private void DeferPaging(ref SimpleQuery query, ICommandBuilder mainCommandBuild
             commandBuilders.Add(commandBuilder);
         }
 
-        private void ApplyPaging(List<ICommandBuilder> commandBuilders, ICommandBuilder mainCommandBuilder, SkipClause skipClause,
-                                 TakeClause takeClause, IQueryPager queryPager)
+        private void ApplyPaging(List<ICommandBuilder> commandBuilders, ICommandBuilder mainCommandBuilder, SkipClause skipClause, TakeClause takeClause, bool hasWithClause, IQueryPager queryPager)
         {
             const int maxInt = 2147483646;
 
             IEnumerable<string> commandTexts;
-            if (skipClause == null)
+            if (skipClause == null && !hasWithClause)
             {
                 commandTexts = queryPager.ApplyLimit(mainCommandBuilder.Text, takeClause.Count);
             }
             else
             {
-                if (takeClause == null) takeClause = new TakeClause(maxInt);
-                commandTexts = queryPager.ApplyPaging(mainCommandBuilder.Text, skipClause.Count,
-                                                      takeClause.Count);
+                int skip = skipClause == null ? 0 : skipClause.Count;
+                int take = takeClause == null ? maxInt : takeClause.Count;
+                commandTexts = queryPager.ApplyPaging(mainCommandBuilder.Text, skip, take);
             }
 
             commandBuilders.AddRange(
diff --git a/Simple.Data.InMemoryTest/Simple.Data.InMemoryTest.csproj b/Simple.Data.InMemoryTest/Simple.Data.InMemoryTest.csproj
@@ -60,6 +60,7 @@
     <Compile Include="InMemoryTests.cs" />
     <Compile Include="NameResolutionTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SimpleQueryConversionTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private ICommandBuilder[] GetPagedQueryCommandBuilders(ref SimpleQuery query, In`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- ApplyPaging(commandBuilders, mainCommandBuilder, skipClause, takeClause, queryPager);`
	`154`	`+ ApplyPaging(commandBuilders, mainCommandBuilder, skipClause, takeClause, query.Clauses.OfType<WithClause>().Any(), queryPager);`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`return commandBuilders.ToArray();`
`@@ -168,21 +168,20 @@ private void DeferPaging(ref SimpleQuery query, ICommandBuilder mainCommandBuild`
`168`	`168`	`commandBuilders.Add(commandBuilder);`
`169`	`169`	`}`
`170`	`170`
`171`		`- private void ApplyPaging(List<ICommandBuilder> commandBuilders, ICommandBuilder mainCommandBuilder, SkipClause skipClause,`
`172`		`- TakeClause takeClause, IQueryPager queryPager)`
	`171`	`+ private void ApplyPaging(List<ICommandBuilder> commandBuilders, ICommandBuilder mainCommandBuilder, SkipClause skipClause, TakeClause takeClause, bool hasWithClause, IQueryPager queryPager)`
`173`	`172`	`{`
`174`	`173`	`const int maxInt = 2147483646;`
`175`	`174`
`176`	`175`	`IEnumerable<string> commandTexts;`
`177`		`- if (skipClause == null)`
	`176`	`+ if (skipClause == null && !hasWithClause)`
`178`	`177`	`{`
`179`	`178`	`commandTexts = queryPager.ApplyLimit(mainCommandBuilder.Text, takeClause.Count);`
`180`	`179`	`}`
`181`	`180`	`else`
`182`	`181`	`{`
`183`		`- if (takeClause == null) takeClause = new TakeClause(maxInt);`
`184`		`- commandTexts = queryPager.ApplyPaging(mainCommandBuilder.Text, skipClause.Count,`
`185`		`- takeClause.Count);`
	`182`	`+ int skip = skipClause == null ? 0 : skipClause.Count;`
	`183`	`+ int take = takeClause == null ? maxInt : takeClause.Count;`
	`184`	`+ commandTexts = queryPager.ApplyPaging(mainCommandBuilder.Text, skip, take);`
`186`	`185`	`}`
`187`	`186`
`188`	`187`	`commandBuilders.AddRange(`