update source

Author: JonathanMagnan

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

@@ -428,15 +428,15 @@ public virtual IRelationalCommand CreateExecutorAndGetCommand(out RelationalQuer
         }
 #elif EFCORE_3X
 
-        private static readonly TypeInfo QueryCompilerTypeInfo = typeof(QueryCompiler).GetTypeInfo();
+        //private static readonly TypeInfo QueryCompilerTypeInfo = typeof(QueryCompiler).GetTypeInfo();
 
-        private static readonly FieldInfo QueryCompilerField = typeof(EntityQueryProvider).GetTypeInfo().DeclaredFields.First(x => x.Name == "_queryCompiler");
+        //private static readonly FieldInfo QueryCompilerField = typeof(EntityQueryProvider).GetTypeInfo().DeclaredFields.First(x => x.Name == "_queryCompiler");
 
-        private static readonly FieldInfo QueryModelGeneratorField = QueryCompilerTypeInfo.DeclaredFields.First(x => x.Name == "_queryModelGenerator");
+        //private static readonly FieldInfo QueryModelGeneratorField = QueryCompilerTypeInfo.DeclaredFields.First(x => x.Name == "_queryModelGenerator");
 
-        private static readonly FieldInfo DataBaseField = QueryCompilerTypeInfo.DeclaredFields.Single(x => x.Name == "_database");
+        //private static readonly FieldInfo DataBaseField = QueryCompilerTypeInfo.DeclaredFields.Single(x => x.Name == "_database");
 
-        private static readonly PropertyInfo DatabaseDependenciesField = typeof(Database).GetTypeInfo().DeclaredProperties.Single(x => x.Name == "Dependencies");
+        //private static readonly PropertyInfo DatabaseDependenciesField = typeof(Database).GetTypeInfo().DeclaredProperties.Single(x => x.Name == "Dependencies");
 
         /// <summary>Creates executor and get command.</summary>
         /// <returns>The new executor and get command.</returns>

src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedByPath_EFCore.cs

@@ -22,7 +22,14 @@ public static IQueryable<T> IncludeOptimizedByPath<T>(IQueryable<T> query, strin
             var elementType = typeof(T);
             var paths = navigationPath.Split('.');
 
-            var context = query.IsInMemoryQueryContext() ? null : query.GetDbContext();
+            var queryForContext = query;
+
+            if (query is QueryIncludeOptimizedParentQueryable<T> queryIncludeOptimizedParent)
+			{
+                queryForContext = queryIncludeOptimizedParent.OriginalQueryable;
+			}
+
+            var context = queryForContext.IsInMemoryQueryContext() ? null : queryForContext.GetDbContext();
 
             // CREATE expression x => x.Right
             var expression = CreateLambdaExpression(elementType, paths, 0, context);

src/shared/Z.EF.Plus._Core.Shared/EFCore/Type/DIsplayName.cs

@@ -0,0 +1,30 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+
+#if FULL || QUERY_INCLUDEOPTIMIZED
+#if EFCORE
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+
+
+namespace Z.EntityFramework.Plus
+{
+    internal static partial class InternalExtensions
+    {
+#if EFCORE_5X
+        internal static string DisplayName(this Type type, bool fullName)
+        {
+            var displayNameMethod = typeof(DbContext).Assembly.GetType("System.SharedTypeExtensions").GetMethod("DisplayName");
+            return (string)displayNameMethod.Invoke(null, new object[] {type, fullName });
+        }
+#endif
+    }
+}
+#endif
+#endif

src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems

@@ -61,6 +61,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)EFCore\IQueryable`\IQueryable`.GetCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EFCore\IQueryable`\IsInMemoryQueryContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EFCore\LazyHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EFCore\Type\DIsplayName.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EFCore\Type\GetTypeFromAssembly_Core.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF\DbContext\DbContext.GetDbSetProperties.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF\DbContext\DbContext.MapReader.cs" />