Visit inside InlineQueryRootExpression in nav expansion

roji · roji · commit 907f2026aa4b · 2023-11-30T01:39:27.000+01:00
Fixes #32331
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs
@@ -249,11 +249,23 @@ protected override Expression VisitExtension(Expression extensionExpression)
 
                 return ApplyQueryFilter(entityType, navigationExpansionExpression);
 
+            // Inline query roots can contain arbitrary expressions, including subqueries with navigations; visit inside to process those.
+            case InlineQueryRootExpression inlineQueryRootExpression:
+            {
+                var visited = inlineQueryRootExpression.Update(this.VisitAndConvert(inlineQueryRootExpression.Values));
+                var currentTree = new NavigationTreeExpression(Expression.Default(inlineQueryRootExpression.ElementType));
+                var parameterName = GetParameterName("e");
+
+                return new NavigationExpansionExpression(visited, currentTree, currentTree, parameterName);
+            }
+
             case QueryRootExpression queryRootExpression:
+            {
                 var currentTree = new NavigationTreeExpression(Expression.Default(queryRootExpression.ElementType));
                 var parameterName = GetParameterName("e");
 
                 return new NavigationExpansionExpression(queryRootExpression, currentTree, currentTree, parameterName);
+            }
 
             case NavigationExpansionExpression:
             case OwnedNavigationReference:
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs
@@ -4606,6 +4606,14 @@ await AssertTranslationFailed(
         AssertSql();
     }
 
+    public override async Task Subquery_with_navigation_inside_inline_collection(bool async)
+    {
+        await AssertTranslationFailed(
+            () => base.Subquery_with_navigation_inside_inline_collection(async));
+
+        AssertSql();
+    }
+
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 
diff --git a/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs
@@ -5652,4 +5652,12 @@ public virtual Task Collection_navigation_equal_to_null_for_subquery_using_Eleme
             ss => ss.Set<Customer>().Where(c => c.Orders.OrderBy(o => o.OrderID).ElementAtOrDefault(prm).OrderDetails == null),
             ss => ss.Set<Customer>().Where(c => c.Orders.OrderBy(o => o.OrderID).ElementAtOrDefault(prm) == null));
     }
+
+    [ConditionalTheory]
+    [MemberData(nameof(IsAsyncData))]
+    public virtual Task Subquery_with_navigation_inside_inline_collection(bool async)
+        => AssertQuery(
+            async,
+            ss => ss.Set<Customer>().Where(c => new[] { 10251, c.Orders.Max(o => o.OrderID) }.Max() > 10251),
+            ss => ss.Set<Customer>().Where(c => c.Orders.Any() && new[] { 10251, c.Orders.Max(o => o.OrderID) }.Max() > 10251));
 }
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs
@@ -7260,6 +7260,21 @@ ORDER BY [o].[OrderID]
 """);
     }
 
+    public override async Task Subquery_with_navigation_inside_inline_collection(bool async)
+    {
+        await base.Subquery_with_navigation_inside_inline_collection(async);
+
+        AssertSql(
+            """
+SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
+FROM [Customers] AS [c]
+WHERE GREATEST(10251, (
+    SELECT MAX([o].[OrderID])
+    FROM [Orders] AS [o]
+    WHERE [c].[CustomerID] = [o].[CustomerID])) > 10251
+""");
+    }
+
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 

Original file line number	Diff line number	Diff line change
`@@ -5652,4 +5652,12 @@ public virtual Task Collection_navigation_equal_to_null_for_subquery_using_Eleme`
`5652`	`5652`	`ss => ss.Set<Customer>().Where(c => c.Orders.OrderBy(o => o.OrderID).ElementAtOrDefault(prm).OrderDetails == null),`
`5653`	`5653`	`ss => ss.Set<Customer>().Where(c => c.Orders.OrderBy(o => o.OrderID).ElementAtOrDefault(prm) == null));`
`5654`	`5654`	`}`
	`5655`	`+`
	`5656`	`+ [ConditionalTheory]`
	`5657`	`+ [MemberData(nameof(IsAsyncData))]`
	`5658`	`+ public virtual Task Subquery_with_navigation_inside_inline_collection(bool async)`
	`5659`	`+ => AssertQuery(`
	`5660`	`+ async,`
	`5661`	`+ ss => ss.Set<Customer>().Where(c => new[] { 10251, c.Orders.Max(o => o.OrderID) }.Max() > 10251),`
	`5662`	`+ ss => ss.Set<Customer>().Where(c => c.Orders.Any() && new[] { 10251, c.Orders.Max(o => o.OrderID) }.Max() > 10251));`
`5655`	`5663`	`}`