Future proof limit clause by including the table type, in case we ever add limit clause expressions.

Author: bordoley

SQLitePCL.pretty.Orm/SqlQuery.Limit.cs

@@ -8,7 +8,7 @@ namespace SQLitePCL.pretty.Orm
 {
     public static partial class SqlQuery
     {
-        public sealed class LimitClause : ISqlQuery
+        public sealed class LimitClause<T> : ISqlQuery
         {
             private readonly string table;
             private readonly string selection;
@@ -32,21 +32,21 @@ internal LimitClause(string table, string selection, Expression where, IReadOnly
             /// </summary>
             /// <param name="n">The number of elements to return.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause Take(int n)
+            public LimitClause<T> Take(int n)
             {
                 Contract.Requires(n >= 0);
-                return new LimitClause(table, selection, where, ordering, n, offset);
+                return new LimitClause<T>(table, selection, where, ordering, n, offset);
             }
 
             /// <summary>
             /// Returns a <see cref="TableQuery&lt;T&gt;"/> that skips a specified number of elements in the result set and then returns the remaining elements.
             /// </summary>
             /// <param name="n">The number of elements to skip before returning the remaining elements.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause Skip(int n)
+            public LimitClause<T> Skip(int n)
             {
                 Contract.Requires(n >= 0);
-                return new LimitClause(table, selection, where, ordering, limit, n);
+                return new LimitClause<T>(table, selection, where, ordering, limit, n);
             }
 
             public override string ToString()

SQLitePCL.pretty.Orm/SqlQuery.OrderBy.cs

@@ -42,21 +42,21 @@ public OrderByClause<T> ThenByDescending<TValue>(Expression<Func<T, TValue>> ord
             /// </summary>
             /// <param name="n">The number of elements to return.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause Take(int n)
+            public LimitClause<T> Take(int n)
             {
                 Contract.Requires(n >= 0);
-                return new LimitClause(table, selection, where, this.ordering, n, null);
+                return new LimitClause<T>(table, selection, where, this.ordering, n, null);
             }
 
             /// <summary>
             /// Returns a <see cref="TableQuery&lt;T&gt;"/> that skips a specified number of elements in the result set and then returns the remaining elements.
             /// </summary>
             /// <param name="n">The number of elements to skip before returning the remaining elements.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause Skip(int n)
+            public LimitClause<T> Skip(int n)
             {
                 Contract.Requires(n >= 0);
-                return new LimitClause(table, selection, where, this.ordering, null, n);
+                return new LimitClause<T>(table, selection, where, this.ordering, null, n);
             }
 
             /// <summary>
@@ -65,7 +65,7 @@ public LimitClause Skip(int n)
             /// <returns>The <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
             /// <param name="index">Index.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause ElementAt(int index)
+            public LimitClause<T> ElementAt(int index)
             {
                 Contract.Requires(index >= 0);
                 return Skip(index).Take(1);

SQLitePCL.pretty.Orm/SqlQuery.Where.cs

@@ -96,21 +96,21 @@ private WhereClause<T> Where(LambdaExpression lambda)
             /// </summary>
             /// <param name="n">The number of elements to return.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause Take(int n)
+            public LimitClause<T> Take(int n)
             {
                 Contract.Requires(n >= 0);
-                return new LimitClause(table, selection, where, new List<Tuple<string, bool>>(), n, null);
+                return new LimitClause<T>(table, selection, where, new List<Tuple<string, bool>>(), n, null);
             }
 
             /// <summary>
             /// Returns a <see cref="TableQuery&lt;T&gt;"/> that skips a specified number of elements in the result set and then returns the remaining elements.
             /// </summary>
             /// <param name="n">The number of elements to skip before returning the remaining elements.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause Skip(int n)
+            public LimitClause<T> Skip(int n)
             {
                 Contract.Requires(n >= 0);
-                return new LimitClause(table, selection, where, new List<Tuple<string, bool>>(), null, n);
+                return new LimitClause<T>(table, selection, where, new List<Tuple<string, bool>>(), null, n);
             }
 
             /// <summary>
@@ -119,7 +119,7 @@ public LimitClause Skip(int n)
             /// <returns>The <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
             /// <param name="index">Index.</param>
             /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-            public LimitClause ElementAt(int index)
+            public LimitClause<T> ElementAt(int index)
             {
                 Contract.Requires(index >= 0);
                 return Skip(index).Take(1);