Query: Merge processing of eager loaded include with normal include

Resolves #16619 This avoids issue of adding includes when includes are not part of projection. Fixed in new nav rewrite
dotnet · Aug 1, 2019 · 0d76ab2 · 0d76ab2
1 parent a631e1b
commit 0d76ab2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs
@@ -221,9 +221,6 @@ public override void No_ignored_include_warning_when_implicit_load()
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 
-        private void AssertContainsSql(params string[] expected)
-            => Fixture.TestSqlLoggerFactory.AssertBaseline(expected, assertOrder: false);
-
         private void ClearLog()
             => Fixture.TestSqlLoggerFactory.Clear();
 

diff --git a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
@@ -92,7 +92,7 @@ public virtual void Query_for_base_type_loads_all_owned_navs()
             }
         }
 
-        [ConditionalFact(Skip = "Issue#16619")]
+        [ConditionalFact]
         public virtual void No_ignored_include_warning_when_implicit_load()
         {
             using (var context = CreateContext())