Fix Query Future

Fix Query Future

Author: zzzprojects

src/shared/Z.EF.Plus.QueryFuture.Shared/BaseQueryFuture.cs

@@ -70,6 +70,8 @@ public abstract class BaseQueryFuture
         /// <value>The query connection.</value>
         internal IRelationalConnection QueryConnection { get; set; }
 
+        internal Action RestoreConnection { get;set;}
+
         public virtual void ExecuteInMemory()
         {
 
@@ -180,8 +182,11 @@ public virtual IRelationalCommand CreateExecutorAndGetCommand(out RelationalQuer
 
                 var innerConnection = new CreateEntityConnection(QueryConnection.DbConnection, null);
                 var innerConnectionField = typeof(RelationalConnection).GetField("_connection", BindingFlags.NonPublic | BindingFlags.Instance);
+                var initalConnection = innerConnectionField.GetValue(QueryConnection);
 
                 innerConnectionField.SetValue(QueryConnection, new Microsoft.EntityFrameworkCore.Internal.LazyRef<DbConnection>(() => innerConnection));
+
+                RestoreConnection = () => innerConnectionField.SetValue(QueryConnection, initalConnection);
             }
 
 

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs

@@ -117,6 +117,8 @@ public void ExecuteQueries()
             }
 
             var connection = Context.Database.GetDbConnection();
+
+            var firstQuery = Queries[0];
 #endif
             var command = CreateCommandCombined();
 
@@ -173,6 +175,13 @@ public void ExecuteQueries()
                     connection.Close();
                 }
             }
+
+#if EFCORE
+            if(firstQuery.RestoreConnection != null)
+            {
+                firstQuery.RestoreConnection();
+            }
+#endif
         }
 
 #if NET45
@@ -217,6 +226,8 @@ public async Task ExecuteQueriesAsync()
             }
 
             var connection = Context.Database.GetDbConnection();
+
+            var firstQuery = Queries[0];
 #endif
             var command = CreateCommandCombined();
 
@@ -273,6 +284,13 @@ public async Task ExecuteQueriesAsync()
                     connection.Close();
                 }
             }
+
+#if EFCORE
+            if (firstQuery.RestoreConnection != null)
+            {
+                firstQuery.RestoreConnection();
+            }
+#endif
         }
 #endif
 

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureEnumerable.cs

@@ -167,8 +167,10 @@ public override void GetResultDirectly()
 
         internal void GetResultDirectly(IQueryable<T> query)
         {
-            using(var enumerator = query.GetEnumerator())
+            using (var enumerator = query.GetEnumerator())
+            {
                 SetResult(enumerator);
+            }
         }
     }
 }

version.txt

@@ -1 +1 @@
-v1.7.4
+v1.7.5