Update project star table correctly while eliminating join

dotnet · May 15, 2017 · 46fe6ba · 46fe6ba
1 parent 98d0194
commit 46fe6ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/EFCore.Relational/Query/RelationalQueryModelVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryModelVisitor.cs
@@ -323,10 +323,9 @@ var newTableExpression
 
                                 selectExpression.RemoveTable(joinExpressionBase);
 
-                                if (ReferenceEquals(selectExpression.ProjectStarTable, joinExpressionBase)
-                                    || ReferenceEquals(selectExpression.ProjectStarTable, joinExpressionBase.TableExpression))
+                                if (ReferenceEquals(selectExpression.ProjectStarTable, joinExpressionBase))
                                 {
-                                    selectExpression.ProjectStarTable = newTableExpression;
+                                    selectExpression.ProjectStarTable = selectExpression.GetTableForQuerySource(newTableExpression.QuerySource);
                                 }
 
                                 var sqlTableReferenceReplacingVisitor

diff --git a/test/EFCore.SqlServer.FunctionalTests/ComplexNavigationsOwnedQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/ComplexNavigationsOwnedQuerySqlServerTest.cs
@@ -16,8 +16,8 @@ public ComplexNavigationsOwnedQuerySqlServerTest(
             ComplexNavigationsOwnedQuerySqlServerFixture fixture, ITestOutputHelper testOutputHelper)
             : base(fixture)
         {
-            fixture.TestSqlLoggerFactory.Clear();
-            //fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
+            Fixture.TestSqlLoggerFactory.Clear();
+            //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
         }
 
         // TODO: Assert SQL