remove more old sqlite tests. Make TableQuery internal for now until the design can be more thoroughly thought out. Remove Binding a table statement with an object of type T

Author: bordoley

SQLitePCL.pretty.Orm/Interfaces.cs

@@ -13,6 +13,9 @@ public interface ITableMapping
         /// </summary>
         String TableName { get; }
 
+        /// <summary>
+        /// Gets the table columns.
+        /// </summary>
         IReadOnlyDictionary<string, ColumnMapping> Columns { get; }
 
         /// <summary>

SQLitePCL.pretty.Orm/TableMappedStatement.cs

@@ -10,13 +10,14 @@ namespace SQLitePCL.pretty.Orm
     /// </summary>
     public static class TableMappedStatement
     {
+        /*
         /// <summary>
         /// Binds the statement bind variables by name to the corresponding properties on the object <paramref name="obj"/>.
         /// </summary>
         /// <param name="This">The statement.</param>
         /// <param name="obj">The object to bind.</param>
         /// <typeparam name="T">The mapped type.</typeparam>
-        public static void Bind<T>(this ITableMappedStatement<T> This, T obj)
+         static void Bind<T>(this ITableMappedStatement<T> This, T obj)
         {
             This.Bind(This.Mapping, obj);
         }
@@ -38,7 +39,7 @@ public static void Execute<T>(this ITableMappedStatement<T> This, T obj)
             This.ClearBindings();
             This.Bind(obj);
             This.MoveNext();
-        }
+        }*/
 
         private static IEnumerator<T> Enumerate<T>(this ITableMappedStatement<T> This)
         {

SQLitePCL.pretty.Orm/TableMapping.cs

@@ -49,7 +49,7 @@ internal static void Bind<T>(this IStatement This, ITableMapping<T> tableMapping
             }
         }
 
-        public static TableQuery<T> Query<T>(this ITableMapping<T> This)
+        internal static TableQuery<T> Query<T>(this ITableMapping<T> This)
         {
             return new TableQuery<T>(This, "*", null, new List<Ordering>(), null, null);
         }

SQLitePCL.pretty.Orm/TableQuery.cs

@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reactive.Linq;
@@ -37,11 +38,10 @@
 
 namespace SQLitePCL.pretty.Orm
 {
-
     /// <summary>
     /// An immutable builder that allows the use of LINQ like syntax to build a SQL query that can subsequently be executed against a SQLite database.
     /// </summary>
-    public sealed class TableQuery<T>
+    internal sealed class TableQuery<T>
     {
         private readonly string _selection;
         private readonly ITableMapping<T> _mapping;
@@ -106,9 +106,9 @@ public override string ToString()
         /// Converts the query to a count query.
         /// </summary>
         /// <returns>A new <see cref="SQLitePCL.pretty.Orm.TableQuery&lt;T&gt;"/>.</returns>
-        public TableQuery<T> Count()
+        public string Count()
         {
-            return new TableQuery<T>(_mapping, "count(*)", _where, _orderBy, _limit, _offset);
+            return new TableQuery<T>(_mapping, "count(*)", _where, _orderBy, _limit, _offset).ToString();
         }
 
         /// <summary>
@@ -125,7 +125,6 @@ public TableQuery<T> Where(Expression<Func<T, bool>> predExpr)
 
                 if (_limit != null || _offset != null)
                 {
-                    // FIXME: Why?
                     throw new NotSupportedException("Cannot call where after a skip or a take");
                 }
 
@@ -467,7 +466,7 @@ private static string GetSqlName (Expression expr)
     /// <summary>
     /// Extension methods for querying a database using instances of <see cref="TableQuery&lt;T&gt;"/>
     /// </summary>
-    public static class TableQuery
+    internal static class TableQuery
     {
         public static ITableMappedStatement<T> PrepareStatement<T>(this IDatabaseConnection This, TableQuery<T> query)
         {
@@ -489,44 +488,14 @@ public static IObservable<T> Query<T>(this IAsyncDatabaseConnection This, TableQ
             return This.Query(query.ToString()).Select(query.Mapping.ToObject);
         }
 
-        public static IStatement PrepareCountStatement<T>(this IDatabaseConnection This, TableQuery<T> query)
-        {
-            return This.PrepareStatement(query.Count().ToString());
-        }
-
-        public static Task<IAsyncStatement> PrepareCountStatemenAsync<T>(this IAsyncDatabaseConnection This, TableQuery<T> query)
-        {
-            return This.PrepareStatementAsync(query.Count().ToString());
-        }
-
-        public static int Count<T>(this IDatabaseConnection This, TableQuery<T> query)
-        {
-            return This.Query(query.Count().ToString()).SelectScalarInt().First();
-        }
-
-        public static Task<int> CountAsync<T>(this IAsyncDatabaseConnection This, TableQuery<T> query)
+        public static IObservable<T> Query<T>(this IAsyncDatabaseConnection This, TableQuery<T> query, params object[] values)
         {
-            return This.CountAsync(query, CancellationToken.None);
-        }
-
-        public static Task<int> CountAsync<T>(this IAsyncDatabaseConnection This, TableQuery<T> query, CancellationToken ct)
-        {
-            return This.Query(query.Count().ToString()).SelectScalarInt().FirstAsync().ToTask(ct);
-        }
-
-        public static int Count<T>(this IDatabaseConnection This, TableQuery<T> query, params object[] values)
-        {
-            return This.Query(query.Count().ToString(), values).SelectScalarInt().First();
-        }
-
-        public static Task<int> CountAsync<T>(this IAsyncDatabaseConnection This, TableQuery<T> query, params object[] values)
-        {
-            return This.CountAsync(query, CancellationToken.None, values);
+            return This.Query(query.ToString(), values).Select(query.Mapping.ToObject);
         }
 
-        public static Task<int> CountAsync<T>(this IAsyncDatabaseConnection This, TableQuery<T> query, CancellationToken ct, params object[] values)
+        public static IStatement PrepareCountStatement<T>(this IDatabaseConnection This, TableQuery<T> query)
         {
-            return This.Query(query.Count().ToString(), values).SelectScalarInt().FirstAsync().ToTask(ct);
+            return This.PrepareStatement(query.Count().ToString());
         }
     }    
 }