Query: Don't use VisitAndConvert in projectionBindingExpressionVisitor (

#18975) Since visiting inner could return null Resolves #18888
dotnet · Dec 10, 2019 · 813358a · 813358a
1 parent b0da3eb
commit 813358a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs
@@ -508,7 +508,7 @@ protected override Expression VisitNew(NewExpression newExpression)
         /// </summary>
         protected override Expression VisitMemberInit(MemberInitExpression memberInitExpression)
         {
-            var newExpression = VisitAndConvert(memberInitExpression.NewExpression, nameof(VisitMemberInit));
+            var newExpression = Visit(memberInitExpression.NewExpression);
             if (newExpression == null)
             {
                 return null;
@@ -530,7 +530,7 @@ protected override Expression VisitMemberInit(MemberInitExpression memberInitExp
                 }
             }
 
-            return memberInitExpression.Update(newExpression, newBindings);
+            return memberInitExpression.Update((NewExpression)newExpression, newBindings);
         }
 
         /// <summary>

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryProjectionBindingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryProjectionBindingExpressionVisitor.cs
@@ -267,7 +267,7 @@ protected override Expression VisitNew(NewExpression newExpression)
 
         protected override Expression VisitMemberInit(MemberInitExpression memberInitExpression)
         {
-            var newExpression = VisitAndConvert(memberInitExpression.NewExpression, nameof(VisitMemberInit));
+            var newExpression = Visit(memberInitExpression.NewExpression);
             if (newExpression == null)
             {
                 return null;
@@ -288,7 +288,7 @@ protected override Expression VisitMemberInit(MemberInitExpression memberInitExp
                 }
             }
 
-            return memberInitExpression.Update(newExpression, newBindings);
+            return memberInitExpression.Update((NewExpression)newExpression, newBindings);
         }
 
         protected override MemberAssignment VisitMemberAssignment(MemberAssignment memberAssignment)

diff --git a/src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs b/src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs
@@ -268,7 +268,7 @@ protected override Expression VisitNew(NewExpression newExpression)
 
         protected override Expression VisitMemberInit(MemberInitExpression memberInitExpression)
         {
-            var newExpression = VisitAndConvert(memberInitExpression.NewExpression, nameof(VisitMemberInit));
+            var newExpression = Visit(memberInitExpression.NewExpression);
             if (newExpression == null)
             {
                 return null;
@@ -290,7 +290,7 @@ protected override Expression VisitMemberInit(MemberInitExpression memberInitExp
                 }
             }
 
-            return memberInitExpression.Update(newExpression, newBindings);
+            return memberInitExpression.Update((NewExpression)newExpression, newBindings);
         }
 
         protected override MemberAssignment VisitMemberAssignment(MemberAssignment memberAssignment)

diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs
@@ -1457,5 +1457,40 @@ public virtual Task LastOrDefault_member_access_in_projection_translates_to_serv
                     .Select(c => new { c, c.Orders.OrderByDescending(o => o.OrderID).LastOrDefault().OrderDate }),
                 entryCount: 4);
         }
+
+        [ConditionalTheory]
+        [MemberData(nameof(IsAsyncData))]
+        public virtual Task Projection_with_parameterized_constructor(bool async)
+        {
+            return AssertQuery(
+                async,
+                ss => ss.Set<Customer>().Where(c => c.CustomerID == "ALFKI").Select(c => new CustomerWrapper2(c)),
+                entryCount: 1,
+                elementSorter: e => e.Customer.CustomerID,
+                elementAsserter: (e, a) => Assert.Equal(e.Customer, a.Customer));
+        }
+
+        [ConditionalTheory]
+        [MemberData(nameof(IsAsyncData))]
+        public virtual Task Projection_with_parameterized_constructor_with_member_assignment(bool async)
+        {
+            return AssertQuery(
+                async,
+                ss => ss.Set<Customer>().Where(c => c.CustomerID == "ALFKI").Select(c => new CustomerWrapper2(c) { City = c.City }),
+                entryCount: 1,
+                elementSorter: e => e.Customer.CustomerID,
+                elementAsserter: (e, a) => Assert.Equal(e.Customer, a.Customer));
+        }
+
+        private class CustomerWrapper2
+        {
+            public CustomerWrapper2(Customer customer)
+            {
+                Customer = customer;
+            }
+
+            public string City { get; set; }
+            public Customer Customer { get; }
+        }
     }
 }