Move Query functions into Database class.

Author: bordoley

SQLitePCL.pretty.Orm/DatabaseConnection.Query.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace SQLitePCL.pretty.Orm
+{
+    public static partial class DatabaseConnection
+    {
+        public static IStatement PrepareStatement(this IDatabaseConnection This, ISqlQuery query)
+        {
+            Contract.Requires(This != null);
+            Contract.Requires(query != null);
+            return This.PrepareStatement(query.ToString());
+        }
+
+        public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(this IDatabaseConnection This, ISqlQuery query)
+        {
+            Contract.Requires(This != null);
+            Contract.Requires(query != null);
+            return This.Query(query.ToString());
+        }
+
+        public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(
+            this IDatabaseConnection This, ISqlQuery query, params object[] values)
+        {
+            Contract.Requires(This != null);
+            Contract.Requires(query != null);
+            Contract.Requires(values != null);
+            return This.Query(query.ToString(), values);
+        }
+    }
+
+    public static partial class AsyncDatabaseConnection
+    {
+        public static IObservable<IReadOnlyList<IResultSetValue>> Query(this IAsyncDatabaseConnection This, ISqlQuery query)
+        {
+            Contract.Requires(This != null);
+            Contract.Requires(query != null);
+            return This.Query(query.ToString());
+        }
+
+        public static IObservable<IReadOnlyList<IResultSetValue>> Query(
+            this IAsyncDatabaseConnection This, ISqlQuery query, params object[] values)
+        {
+            Contract.Requires(This != null);
+            Contract.Requires(query != null);
+            Contract.Requires(values != null);
+            return This.Query(query.ToString(), values);
+        }
+    }
+}
+

SQLitePCL.pretty.Orm/SQLitePCL.pretty.Orm.csproj

@@ -154,6 +154,7 @@
     <Compile Include="DatabaseConnection.InsertOrReplace.cs" />
     <Compile Include="SqlQuery.From.cs" />
     <Compile Include="ResultSet.cs" />
+    <Compile Include="DatabaseConnection.Query.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <ItemGroup>

SQLitePCL.pretty.Orm/SqlQuery.OrderBy.cs

@@ -82,6 +82,31 @@ public override string ToString()
                     (ordering.Count > 0 ? "\r\nORDER BY " +  string.Join(", ", ordering.Select(o => "\"" + o.Item1 + "\"" + (o.Item2 ? "" : " DESC"))) : "");
             }
         }
+
+        private static Tuple<string, bool> CompileOrderByExpression<T, TValue>(this Expression<Func<T, TValue>> orderExpr, bool asc)
+        {
+            var lambda = orderExpr;
+
+            MemberExpression mem = null;
+
+            var unary = lambda.Body as UnaryExpression;
+            if (unary != null && unary.NodeType == ExpressionType.Convert)
+            {
+
+                mem = unary.Operand as MemberExpression;
+            }
+            else
+            {
+                mem = lambda.Body as MemberExpression;
+            }
+
+            if (mem != null && (mem.Expression.NodeType == ExpressionType.Parameter))
+            {
+                return Tuple.Create(((PropertyInfo) mem.Member).GetColumnName(), asc);
+            }
+
+            throw new NotSupportedException("Order By does not support: " + orderExpr);
+        }
     }
 }
 

SQLitePCL.pretty.Orm/SqlQuery.cs

@@ -69,29 +69,6 @@ public static bool IsNot<T>(this Nullable<T> This, Nullable<T> other = null)
 
     public static partial class SqlQuery
     {
-        public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(this IDatabaseConnection This, ISqlQuery query)
-        {
-            Contract.Requires(This != null);
-            Contract.Requires(query != null);
-            return This.Query(query.ToString());
-        }
-
-        public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(
-            this IDatabaseConnection This, ISqlQuery query, params object[] values)
-        {
-            Contract.Requires(This != null);
-            Contract.Requires(query != null);
-            Contract.Requires(values != null);
-            return This.Query(query.ToString(), values);
-        }
-
-        public static IStatement PrepareStatement(this IDatabaseConnection This, ISqlQuery query)
-        {
-            Contract.Requires(This != null);
-            Contract.Requires(query != null);
-            return This.PrepareStatement(query.ToString());
-        }
-
         public static FromClause<T> From<T>()
         {
             var typ = typeof(T);
@@ -192,30 +169,5 @@ private static string GetSqlName(Expression prop)
                     throw new NotSupportedException ("Cannot get SQL for: " + n);
             }
         }
-
-        private static Tuple<string, bool> CompileOrderByExpression<T, TValue>(this Expression<Func<T, TValue>> orderExpr, bool asc)
-            {
-                var lambda = orderExpr;
-
-                MemberExpression mem = null;
-
-                var unary = lambda.Body as UnaryExpression;
-                if (unary != null && unary.NodeType == ExpressionType.Convert)
-                {
-
-                    mem = unary.Operand as MemberExpression;
-                }
-                else
-                {
-                    mem = lambda.Body as MemberExpression;
-                }
-
-                if (mem != null && (mem.Expression.NodeType == ExpressionType.Parameter))
-                {
-                    return Tuple.Create(((PropertyInfo) mem.Member).GetColumnName(), asc);
-                }
-
-                throw new NotSupportedException("Order By does not support: " + orderExpr);
-            }
     }
 }