Fixing QueryIncludeOptimized with Self-Hierachy

zzzprojects · zzzprojects · commit 38305349040e · 2017-05-17T08:50:26.000-04:00
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyFileVersion("1.5.2")]
+[assembly: AssemblyVersion("1.5.4")]
+[assembly: AssemblyFileVersion("1.5.4")]
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs b/src/Z.EntityFramework.Plus.EF5.NET40/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs
@@ -48,7 +48,14 @@ public override void CreateIncludeQuery(IQueryable rootQuery)
 
             if (QueryIncludeOptimizedManager.AllowQueryBatch)
             {
-                queryable.Select(Filter).Future();
+                var subQuery = queryable.Select(Filter);
+
+                if (subQuery is QueryIncludeOptimizedParentQueryable<TChild>)
+                {
+                    subQuery = ((QueryIncludeOptimizedParentQueryable<TChild>) subQuery).OriginalQueryable;
+                }
+
+                subQuery.Future();
             }
             else
             {
diff --git a/src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("abcbb878-043c-4957-a334-90e9872e684e")]
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyFileVersion("1.5.2")]
+[assembly: AssemblyVersion("1.5.4")]
+[assembly: AssemblyFileVersion("1.5.4")]
diff --git a/src/Z.EntityFramework.Plus.EF5/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs b/src/Z.EntityFramework.Plus.EF5/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs
@@ -48,7 +48,14 @@ public override void CreateIncludeQuery(IQueryable rootQuery)
 
             if (QueryIncludeOptimizedManager.AllowQueryBatch)
             {
-                queryable.Select(Filter).Future();
+                var subQuery = queryable.Select(Filter);
+
+                if (subQuery is QueryIncludeOptimizedParentQueryable<TChild>)
+                {
+                    subQuery = ((QueryIncludeOptimizedParentQueryable<TChild>) subQuery).OriginalQueryable;
+                }
+
+                subQuery.Future();
             }
             else
             {
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
-[assembly: AssemblyVersion("1.5.3")]
-[assembly: AssemblyFileVersion("1.5.3")]
+[assembly: AssemblyVersion("1.5.4")]
+[assembly: AssemblyFileVersion("1.5.4")]
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs b/src/Z.EntityFramework.Plus.EF6.NET40/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs
@@ -48,7 +48,14 @@ public override void CreateIncludeQuery(IQueryable rootQuery)
 
             if (QueryIncludeOptimizedManager.AllowQueryBatch)
             {
-                queryable.Select(Filter).Future();
+                var subQuery = queryable.Select(Filter);
+
+                if (subQuery is QueryIncludeOptimizedParentQueryable<TChild>)
+                {
+                    subQuery = ((QueryIncludeOptimizedParentQueryable<TChild>) subQuery).OriginalQueryable;
+                }
+
+                subQuery.Future();
             }
             else
             {
diff --git a/src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
-[assembly: AssemblyVersion("1.5.3")]
-[assembly: AssemblyFileVersion("1.5.3")]
+[assembly: AssemblyVersion("1.5.4")]
+[assembly: AssemblyFileVersion("1.5.4")]
diff --git a/src/Z.EntityFramework.Plus.EF6/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs b/src/Z.EntityFramework.Plus.EF6/QueryIncludeOptimized/QueryIncludeOptimizedChild`2.cs
@@ -48,7 +48,14 @@ public override void CreateIncludeQuery(IQueryable rootQuery)
 
             if (QueryIncludeOptimizedManager.AllowQueryBatch)
             {
-                queryable.Select(Filter).Future();
+                var subQuery = queryable.Select(Filter);
+
+                if (subQuery is QueryIncludeOptimizedParentQueryable<TChild>)
+                {
+                    subQuery = ((QueryIncludeOptimizedParentQueryable<TChild>) subQuery).OriginalQueryable;
+                }
+
+                subQuery.Future();
             }
             else
             {
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.5.3
+v1.5.4

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,14 @@ public override void CreateIncludeQuery(IQueryable rootQuery)`
`48`	`48`
`49`	`49`	`if (QueryIncludeOptimizedManager.AllowQueryBatch)`
`50`	`50`	`{`
`51`		`- queryable.Select(Filter).Future();`
	`51`	`+ var subQuery = queryable.Select(Filter);`
	`52`	`+`
	`53`	`+ if (subQuery is QueryIncludeOptimizedParentQueryable<TChild>)`
	`54`	`+ {`
	`55`	`+ subQuery = ((QueryIncludeOptimizedParentQueryable<TChild>) subQuery).OriginalQueryable;`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ subQuery.Future();`
`52`	`59`	`}`
`53`	`60`	`else`
`54`	`61`	`{`