Merge pull request #120 from ksmithRenweb/pr/113b

Pr/113b

Author: JonathanMagnan

src/Z.EntityFramework.Plus.EFCore/QueryFuture/BaseQueryFuture.cs

@@ -37,7 +37,7 @@ namespace Z.EntityFramework.Plus
 #if QUERY_INCLUDEOPTIMIZED
     internal abstract class BaseQueryFuture
 #else
-    public abstract class BaseQueryFuture
+    public abstract class BaseQueryFuture<TResult> : IBaseQueryFuture
 #endif
     {
         /// <summary>Gets the value indicating whether the query future has a value.</summary>
@@ -55,7 +55,7 @@ public abstract class BaseQueryFuture
 #elif EFCORE
     /// <summary>Gets or sets the query deferred.</summary>
     /// <value>The query deferred.</value>
-        public IQueryable Query { get; set; }
+        public IQueryable<TResult> Query { get; set; }
 
         /// <summary>Gets or sets the query deferred executor.</summary>
         /// <value>The query deferred executor.</value>
@@ -115,10 +115,6 @@ public virtual IRelationalCommand CreateExecutorAndGetCommand(out RelationalQuer
             var connectionField = queryContextFactory.GetType().GetField("_connection", BindingFlags.NonPublic | BindingFlags.Instance);
             var connection = (IRelationalConnection) connectionField.GetValue(queryContextFactory);
 
-            // REFLECTION: Query.Provider._queryCompiler._database._queryCompilationContextFactory
-            var queryCompilationContextFactoryField = typeof (Database).GetField("_queryCompilationContextFactory", BindingFlags.NonPublic | BindingFlags.Instance);
-            var queryCompilationContextFactory = (IQueryCompilationContextFactory) queryCompilationContextFactoryField.GetValue(database);
-
             // CREATE connection
             QueryConnection = new CreateEntityRelationConnection(connection);
 
@@ -144,6 +140,10 @@ public virtual IRelationalCommand CreateExecutorAndGetCommand(out RelationalQuer
                 }
             }
 
+            // REFLECTION: Query.Provider._queryCompiler._database._queryCompilationContextFactory
+            var queryCompilationContextFactoryField = typeof(Database).GetField("_queryCompilationContextFactory", BindingFlags.NonPublic | BindingFlags.Instance);
+            var queryCompilationContextFactory = (IQueryCompilationContextFactory)queryCompilationContextFactoryField.GetValue(database);
+
             // REFLECTION: Query.Provider._queryCompiler._database._queryCompilationContextFactory.Logger
             var loggerField = queryCompilationContextFactory.GetType().GetProperty("Logger", BindingFlags.NonPublic | BindingFlags.Instance);
             var logger = (ISensitiveDataLogger)loggerField.GetValue(queryCompilationContextFactory);
@@ -179,6 +179,11 @@ public virtual void SetResult(DbDataReader reader)
         {
         }
 
+        public virtual void GetResultDirectly()
+        {
+
+        }
+
         /// <summary>Sets the result of the query deferred.</summary>
         /// <param name="reader">The reader returned from the query execution.</param>
         public IEnumerator<T> GetQueryEnumerator<T>(DbDataReader reader)

src/Z.EntityFramework.Plus.EFCore/QueryFuture/IBaseQueryFuture.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.Storage;
+using System.Data.Common;
+
+namespace Z.EntityFramework.Plus
+{
+    public interface IBaseQueryFuture
+    {
+        void GetResultDirectly();
+        void SetResult(DbDataReader reader);
+
+        IRelationalCommand CreateExecutorAndGetCommand(out RelationalQueryContext queryContext);
+    }
+}

src/Z.EntityFramework.Plus.EFCore/QueryFuture/QueryFutureBatch.cs

@@ -47,7 +47,7 @@ public QueryFutureBatch(DbContext context)
 #endif
         {
             Context = context;
-            Queries = new List<BaseQueryFuture>();
+            Queries = new List<IBaseQueryFuture>();
         }
 
         /// <summary>Gets or sets the context related to the query future batched.</summary>
@@ -60,11 +60,18 @@ public QueryFutureBatch(DbContext context)
 
         /// <summary>Gets or sets deferred query lists waiting to be executed.</summary>
         /// <value>The deferred queries list waiting to be executed.</value>
-        public List<BaseQueryFuture> Queries { get; set; }
+        public List<IBaseQueryFuture> Queries { get; set; }
 
         /// <summary>Executes deferred query lists.</summary>
         public void ExecuteQueries()
         {
+            if (Queries.Count == 1)
+            {
+                Queries[0].GetResultDirectly();
+                Queries.Clear();
+                return;
+            }
+
 #if EF5 || EF6
             var connection = (EntityConnection) Context.Connection;
 #elif EFCORE

src/Z.EntityFramework.Plus.EFCore/QueryFuture/QueryFutureEnumerable.cs

@@ -22,15 +22,15 @@
 namespace Z.EntityFramework.Plus
 {
     /// <summary>Class for query future value.</summary>
-    /// <typeparam name="T">The type of elements of the query.</typeparam>
+    /// <typeparam name="TResult">The type of elements of the query.</typeparam>
 #if QUERY_INCLUDEOPTIMIZED
     internal class QueryFutureEnumerable<T> : BaseQueryFuture, IEnumerable<T>
 #else
-    public class QueryFutureEnumerable<T> : BaseQueryFuture, IEnumerable<T>
+    public class QueryFutureEnumerable<TResult> : BaseQueryFuture<TResult>, IEnumerable<TResult>
 #endif
     {
         /// <summary>The result of the query future.</summary>
-        private IEnumerable<T> _result;
+        private IEnumerable<TResult> _result;
 
         /// <summary>Constructor.</summary>
         /// <param name="ownerBatch">The batch that owns this item.</param>
@@ -41,7 +41,7 @@ public class QueryFutureEnumerable<T> : BaseQueryFuture, IEnumerable<T>
 #if EF5 || EF6
         public QueryFutureEnumerable(QueryFutureBatch ownerBatch, ObjectQuery<T> query)
 #elif EFCORE
-        public QueryFutureEnumerable(QueryFutureBatch ownerBatch, IQueryable query)
+        public QueryFutureEnumerable(QueryFutureBatch ownerBatch, IQueryable<TResult> query)
 #endif
         {
             OwnerBatch = ownerBatch;
@@ -50,7 +50,7 @@ public QueryFutureEnumerable(QueryFutureBatch ownerBatch, IQueryable query)
 
         /// <summary>Gets the enumerator of the query future.</summary>
         /// <returns>The enumerator of the query future.</returns>
-        public IEnumerator<T> GetEnumerator()
+        public IEnumerator<TResult> GetEnumerator()
         {
             if (!HasValue)
             {
@@ -59,7 +59,7 @@ public IEnumerator<T> GetEnumerator()
 
             if (_result == null)
             {
-                return new List<T>().GetEnumerator();
+                return new List<TResult>().GetEnumerator();
             }
 
             return _result.GetEnumerator();
@@ -78,10 +78,15 @@ IEnumerator IEnumerable.GetEnumerator()
         /// <param name="reader">The reader returned from the query execution.</param>
         public override void SetResult(DbDataReader reader)
         {
-            var enumerator = GetQueryEnumerator<T>(reader);
+            var enumerator = GetQueryEnumerator<TResult>(reader);
 
+            SetResult(enumerator);
+        }
+
+        private void SetResult(IEnumerator<TResult> enumerator)
+        {
             // Enumerate on all items
-            var list = new List<T>();
+            var list = new List<TResult>();
             while (enumerator.MoveNext())
             {
                 list.Add(enumerator.Current);
@@ -90,5 +95,12 @@ public override void SetResult(DbDataReader reader)
 
             HasValue = true;
         }
+
+        public override void GetResultDirectly()
+        {
+            var enumerator = Query.GetEnumerator();
+
+            SetResult(enumerator);
+        }
     }
 }

src/Z.EntityFramework.Plus.EFCore/QueryFuture/QueryFutureValue.cs

@@ -24,7 +24,7 @@ namespace Z.EntityFramework.Plus
 #if QUERY_INCLUDEOPTIMIZED
     internal class QueryFutureValue<TResult> : BaseQueryFuture
 #else
-    public class QueryFutureValue<TResult> : BaseQueryFuture
+    public class QueryFutureValue<TResult> : BaseQueryFuture<TResult>
 #endif
     {
         /// <summary>The result of the query future.</summary>
@@ -39,7 +39,7 @@ public class QueryFutureValue<TResult> : BaseQueryFuture
 #if EF5 || EF6
         public QueryFutureValue(QueryFutureBatch ownerBatch, ObjectQuery query)
 #elif EFCORE
-        public QueryFutureValue(QueryFutureBatch ownerBatch, IQueryable query)
+        public QueryFutureValue(QueryFutureBatch ownerBatch, IQueryable<TResult> query)
 #endif
         {
             OwnerBatch = ownerBatch;
@@ -73,5 +73,14 @@ public override void SetResult(DbDataReader reader)
 
             HasValue = true;
         }
+
+        public override void GetResultDirectly()
+        {
+            var value = Query.Provider.Execute<TResult>(Query.Expression);
+
+            _result = value;
+
+            HasValue = true;
+        }
     }
 }