From 658fab3ca8670354b1f04002e2a931cc2003adca Mon Sep 17 00:00:00 2001
From: Smit Patel <smitpatel@users.noreply.github.com>
Date: Mon, 5 Aug 2019 14:16:32 -0700
Subject: [PATCH] Query: Expand owned FK navigation leading to non-owned entity

Owned FK whose navigation points to owned which is non-owned entity needs to be expanded out.
---
 ...ingExpressionVisitor.ExpressionVisitors.cs |  9 ++---
 .../Query/OwnedQueryTestBase.cs               |  6 ++--
 .../Query/OwnedQuerySqlServerTest.cs          | 33 +++++++++++++++++--
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
index 41e74836f36..31a071015d6 100644
--- a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
+++ b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
@@ -67,12 +67,7 @@ protected override Expression VisitMember(MemberExpression memberExpression)
             {
                 var innerExpression = Visit(memberExpression.Expression);
                 var expansion = TryExpandNavigation(innerExpression, MemberIdentity.Create(memberExpression.Member));
-                if (expansion != null)
-                {
-                    return expansion;
-                }
-
-                return memberExpression.Update(innerExpression);
+                return expansion ?? memberExpression.Update(innerExpression);
             }
 
             protected override Expression VisitMethodCall(MethodCallExpression methodCallExpression)
@@ -137,7 +132,7 @@ protected Expression ExpandNavigation(
                     return expansion;
                 }
 
-                if (navigation.ForeignKey.IsOwnership)
+                if (navigation.GetTargetType().IsOwned())
                 {
                     var ownedEntityReference = new EntityReference(navigation.GetTargetType());
                     ownedEntityReference.MarkAsOptional();
diff --git a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
index db266b3f1bb..cb6f9406ea5 100644
--- a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
+++ b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
@@ -140,7 +140,7 @@ public virtual void Query_when_group_by()
             }
         }
 
-        [ConditionalFact(Skip = "Investigate")]
+        [ConditionalFact(Skip = "Issue#16330")]
         public virtual void Query_when_subquery()
         {
             using (var context = CreateContext())
@@ -218,7 +218,7 @@ public virtual void Navigation_rewrite_on_owned_collection_with_composition()
             }
         }
 
-        [ConditionalFact(Skip = "Investigate")]
+        [ConditionalFact]
         public virtual void Navigation_rewrite_on_owned_collection_with_composition_complex()
         {
             using (var ctx = CreateContext())
@@ -288,7 +288,7 @@ public virtual void Project_multiple_owned_navigations()
             }
         }
 
-        [ConditionalFact(Skip = "Investigate")]
+        [ConditionalFact]
         public virtual void Project_multiple_owned_navigations_with_expansion_on_owned_collections()
         {
             using (var ctx = CreateContext())
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs
index 28925fbbb81..4cf024b4811 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs
@@ -305,7 +305,19 @@ public override void Navigation_rewrite_on_owned_collection_with_composition_com
             base.Navigation_rewrite_on_owned_collection_with_composition_complex();
 
             AssertSql(
-                @"");
+                @"SELECT (
+    SELECT TOP(1) [o].[PersonAddress_Country_Name]
+    FROM [Order] AS [o0]
+    LEFT JOIN (
+        SELECT [o1].[Id], [o1].[Discriminator]
+        FROM [OwnedPerson] AS [o1]
+        WHERE [o1].[Discriminator] IN (N'OwnedPerson', N'Branch', N'LeafB', N'LeafA')
+    ) AS [t] ON [o0].[ClientId] = [t].[Id]
+    LEFT JOIN [OwnedPerson] AS [o2] ON [t].[Id] = [o2].[Id]
+    LEFT JOIN [OwnedPerson] AS [o] ON [o2].[Id] = [o].[Id]
+    WHERE [o3].[Id] = [o0].[ClientId])
+FROM [OwnedPerson] AS [o3]
+WHERE [o3].[Discriminator] IN (N'OwnedPerson', N'Branch', N'LeafB', N'LeafA')");
         }
 
         public override void SelectMany_on_owned_collection()
@@ -367,7 +379,24 @@ public override void Project_multiple_owned_navigations_with_expansion_on_owned_
             base.Project_multiple_owned_navigations_with_expansion_on_owned_collections();
 
             AssertSql(
-                @"");
+                @"SELECT (
+    SELECT COUNT(*)
+    FROM [Order] AS [o]
+    LEFT JOIN (
+        SELECT [o0].[Id], [o0].[Discriminator]
+        FROM [OwnedPerson] AS [o0]
+        WHERE [o0].[Discriminator] IN (N'OwnedPerson', N'Branch', N'LeafB', N'LeafA')
+    ) AS [t] ON [o].[ClientId] = [t].[Id]
+    LEFT JOIN [OwnedPerson] AS [o1] ON [t].[Id] = [o1].[Id]
+    LEFT JOIN [OwnedPerson] AS [o2] ON [o1].[Id] = [o2].[Id]
+    LEFT JOIN [Planet] AS [p] ON [o2].[PersonAddress_Country_PlanetId] = [p].[Id]
+    LEFT JOIN [Star] AS [s] ON [p].[StarId] = [s].[Id]
+    WHERE ([o3].[Id] = [o].[ClientId]) AND (([s].[Id] <> 42) OR [s].[Id] IS NULL)) AS [Count], [p0].[Id], [p0].[StarId]
+FROM [OwnedPerson] AS [o3]
+LEFT JOIN [OwnedPerson] AS [o4] ON [o3].[Id] = [o4].[Id]
+LEFT JOIN [OwnedPerson] AS [o5] ON [o4].[Id] = [o5].[Id]
+LEFT JOIN [Planet] AS [p0] ON [o5].[PersonAddress_Country_PlanetId] = [p0].[Id]
+WHERE [o3].[Discriminator] IN (N'OwnedPerson', N'Branch', N'LeafB', N'LeafA')");
         }
 
         public override void Navigation_rewrite_on_owned_reference_followed_by_regular_entity_filter()