Add IStatement/IAsyncStatement.Query methods.

Author: bordoley

SQLitePCL.pretty.Async/AsyncStatement.cs

@@ -141,6 +141,29 @@ public static Task ExecuteAsync(
         {
             return This.ExecuteAsync(CancellationToken.None, values);
         }
+
+        /// <summary>
+        /// Queries the database asynchronously using the provided IStatement and provided bind variables.
+        /// </summary>
+        /// <param name="This">The async statement.</param>
+        /// <param name="values">The position indexed values to bind.</param>
+        /// <returns>A cold IObservable of the rows in the result set.</returns>
+        public static IObservable<IReadOnlyList<IResultSetValue>> Query(
+            this IAsyncStatement This, 
+            params object[] values)
+        {
+            return This.Use<IReadOnlyList<IResultSetValue>>(stmt => stmt.Query(values));
+        }
+
+        /// <summary>
+        /// Queries the database asynchronously using the provided IStatement
+        /// </summary>
+        /// <param name="This">The async statement.</param>
+        /// <returns>A cold IObservable of the rows in the result set.</returns>
+        public static IObservable<IReadOnlyList<IResultSetValue>> Query(this IAsyncStatement This)
+        {
+            return This.Use<IReadOnlyList<IResultSetValue>>(stmt => stmt.Query());
+        }
     }
 
     internal class AsyncStatementImpl : IAsyncStatement

SQLitePCL.pretty/DatabaseConnection.cs

@@ -294,8 +294,10 @@ public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(
             Contract.Requires(This != null);
             Contract.Requires(sql != null);
 
-            object[] empty = { };
-            return This.Query(sql, empty);
+            return new DelegatingEnumerable<IReadOnlyList<IResultSetValue>>(() =>
+                {
+                    return This.PrepareStatement(sql);
+                });
         }
 
         /// <summary>

SQLitePCL.pretty/Statement.cs

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
 
@@ -91,5 +92,44 @@ public static void Execute(this IStatement This, params object[] values)
             This.Bind(values);
             This.MoveNext();
         }
+
+        /// <summary>
+        /// Queries the database using the provided IStatement and provided bind variables.
+        /// </summary>
+        /// <param name="This">The statements.</param>
+        /// <param name="values">The position indexed values to bind.</param>
+        /// <returns>An <see cref="IEnumerable&lt;T&gt;"/> of rows in the result set.</returns>
+        public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(
+            this IStatement This, 
+            params object[] values)
+        {
+            Contract.Requires(This != null);
+            Contract.Requires(values != null);
+
+            return new DelegatingEnumerable<IReadOnlyList<IResultSetValue>>(() => 
+                {
+                    This.Reset();
+                    This.ClearBindings();
+                    This.Bind(values);
+                    return This;
+                });
+        }
+
+        /// <summary>
+        /// Queries the database using the provided IStatement.
+        /// </summary>
+        /// <param name="This">The statements.</param>
+        /// <returns>An <see cref="IEnumerable&lt;T&gt;"/> of rows in the result set.</returns>
+        public static IEnumerable<IReadOnlyList<IResultSetValue>> Query(this IStatement This)
+        {
+            Contract.Requires(This != null);
+
+            return new DelegatingEnumerable<IReadOnlyList<IResultSetValue>>(() => 
+                {
+                    This.Reset();
+                    This.ClearBindings();
+                    return This;
+                });
+        }
     }
 }