Merge branch 'rel/1.0.1' into fix6366_rel3

src/Microsoft.EntityFrameworkCore.Relational/Query/ExpressionVisitors/Internal/IncludeExpressionVisitor.cs

@@ -611,7 +611,14 @@ private static IEnumerable<Expression> ExtractProjections(TableExpressionBase ta
 
             if (selectExpression != null)
             {
-                return selectExpression.Projection.ToList();
+                if (selectExpression.IsProjectStar)
+                {
+                    return selectExpression.Tables.SelectMany(ExtractProjections);
+                }
+                else
+                {
+                    return selectExpression.Projection.ToList();
+                }
             }
 
             var joinExpression = tableExpression as JoinExpressionBase;

src/Microsoft.EntityFrameworkCore.Specification.Tests/ComplexNavigationsQueryTestBase.cs

@@ -2692,6 +2692,78 @@ public virtual void Complex_multi_include_with_order_by_and_paging()
             }
         }
 
+        [ConditionalFact]
+        public virtual void Complex_multi_include_with_order_by_and_paging_joins_on_correct_key()
+        {
+            List<string> expected;
+
+            using (var context = CreateContext())
+            {
+                expected = context.LevelOne
+                    .Include(e => e.OneToOne_Optional_FK).ThenInclude(e => e.OneToMany_Optional)
+                    .Include(e => e.OneToOne_Required_FK).ThenInclude(e => e.OneToMany_Required)
+                    .ToList()
+                    .OrderBy(t => t.Name)
+                    .Skip(0).Take(10)
+                    .Select(e => e.Name)
+                    .ToList();
+            }
+
+            ClearLog();
+
+            using (var context = CreateContext())
+            {
+                var query = context.LevelOne
+                    .Include(e => e.OneToOne_Optional_FK).ThenInclude(e => e.OneToMany_Optional)
+                    .Include(e => e.OneToOne_Required_FK).ThenInclude(e => e.OneToMany_Required)
+                    .OrderBy(t => t.Name)
+                    .Skip(0).Take(10);
+
+                var result = query.ToList();
+
+                Assert.Equal(expected.Count, result.Count);
+                for (var i = 0; i < result.Count; i++)
+                {
+                    Assert.True(expected.Contains(result[i]?.Name));
+                }
+            }
+        }
+
+        [ConditionalFact]
+        public virtual void Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2()
+        {
+            List<string> expected;
+
+            using (var context = CreateContext())
+            {
+                expected = context.LevelOne
+                    .Include(e => e.OneToOne_Optional_FK.OneToOne_Required_FK).ThenInclude(e => e.OneToMany_Optional)
+                    .ToList()
+                    .OrderBy(t => t.Name)
+                    .Skip(0).Take(10)
+                    .Select(e => e.Name)
+                    .ToList();
+            }
+
+            ClearLog();
+
+            using (var context = CreateContext())
+            {
+                var query = context.LevelOne
+                    .Include(e => e.OneToOne_Optional_FK.OneToOne_Required_FK).ThenInclude(e => e.OneToMany_Optional)
+                    .OrderBy(t => t.Name)
+                    .Skip(0).Take(10);
+
+                var result = query.ToList();
+
+                Assert.Equal(expected.Count, result.Count);
+                for (var i = 0; i < result.Count; i++)
+                {
+                    Assert.True(expected.Contains(result[i]?.Name));
+                }
+            }
+        }
+
         [ConditionalFact]
         public virtual void Multiple_include_with_multiple_optional_navigations()
         {

test/Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests/ComplexNavigationsQuerySqlServerTest.cs

@@ -1393,7 +1393,7 @@ public override void Complex_multi_include_with_order_by_and_paging()
         ORDER BY [e].[Name], [l].[Id], [l2].[Id]
         OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
     ) AS [t0]
-) AS [l20] ON [l3].[OneToMany_Required_InverseId] = [l20].[Id]
+) AS [l20] ON [l3].[OneToMany_Required_InverseId] = [l20].[Id0]
 ORDER BY [l20].[Name], [l20].[Id], [l20].[Id0]
 
 @__p_0: ?
@@ -1416,6 +1416,99 @@ public override void Complex_multi_include_with_order_by_and_paging()
             }
         }
 
+        public override void Complex_multi_include_with_order_by_and_paging_joins_on_correct_key()
+        {
+            base.Complex_multi_include_with_order_by_and_paging_joins_on_correct_key();
+
+            if (SupportsOffset)
+            {
+                Assert.Equal(
+                    @"@__p_0: ?
+@__p_1: ?
+
+SELECT [e].[Id], [e].[Date], [e].[Name], [e].[OneToMany_Optional_Self_InverseId], [e].[OneToMany_Required_Self_InverseId], [e].[OneToOne_Optional_SelfId], [l].[Id], [l].[Date], [l].[Level1_Optional_Id], [l].[Level1_Required_Id], [l].[Name], [l].[OneToMany_Optional_InverseId], [l].[OneToMany_Optional_Self_InverseId], [l].[OneToMany_Required_InverseId], [l].[OneToMany_Required_Self_InverseId], [l].[OneToOne_Optional_PK_InverseId], [l].[OneToOne_Optional_SelfId], [l2].[Id], [l2].[Date], [l2].[Level1_Optional_Id], [l2].[Level1_Required_Id], [l2].[Name], [l2].[OneToMany_Optional_InverseId], [l2].[OneToMany_Optional_Self_InverseId], [l2].[OneToMany_Required_InverseId], [l2].[OneToMany_Required_Self_InverseId], [l2].[OneToOne_Optional_PK_InverseId], [l2].[OneToOne_Optional_SelfId]
+FROM [Level1] AS [e]
+LEFT JOIN [Level2] AS [l] ON [l].[Level1_Optional_Id] = [e].[Id]
+LEFT JOIN [Level2] AS [l2] ON [l2].[Level1_Required_Id] = [e].[Id]
+ORDER BY [e].[Name], [l].[Id], [l2].[Id]
+OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
+
+@__p_0: ?
+@__p_1: ?
+
+SELECT [l3].[Id], [l3].[Level2_Optional_Id], [l3].[Level2_Required_Id], [l3].[Name], [l3].[OneToMany_Optional_InverseId], [l3].[OneToMany_Optional_Self_InverseId], [l3].[OneToMany_Required_InverseId], [l3].[OneToMany_Required_Self_InverseId], [l3].[OneToOne_Optional_PK_InverseId], [l3].[OneToOne_Optional_SelfId]
+FROM [Level3] AS [l3]
+INNER JOIN (
+    SELECT DISTINCT [t0].*
+    FROM (
+        SELECT [e].[Name], [l].[Id], [l2].[Id] AS [Id0]
+        FROM [Level1] AS [e]
+        LEFT JOIN [Level2] AS [l] ON [l].[Level1_Optional_Id] = [e].[Id]
+        LEFT JOIN [Level2] AS [l2] ON [l2].[Level1_Required_Id] = [e].[Id]
+        ORDER BY [e].[Name], [l].[Id], [l2].[Id]
+        OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
+    ) AS [t0]
+) AS [l20] ON [l3].[OneToMany_Required_InverseId] = [l20].[Id0]
+ORDER BY [l20].[Name], [l20].[Id], [l20].[Id0]
+
+@__p_0: ?
+@__p_1: ?
+
+SELECT [l0].[Id], [l0].[Level2_Optional_Id], [l0].[Level2_Required_Id], [l0].[Name], [l0].[OneToMany_Optional_InverseId], [l0].[OneToMany_Optional_Self_InverseId], [l0].[OneToMany_Required_InverseId], [l0].[OneToMany_Required_Self_InverseId], [l0].[OneToOne_Optional_PK_InverseId], [l0].[OneToOne_Optional_SelfId]
+FROM [Level3] AS [l0]
+INNER JOIN (
+    SELECT DISTINCT [t].*
+    FROM (
+        SELECT [e].[Name], [l].[Id]
+        FROM [Level1] AS [e]
+        LEFT JOIN [Level2] AS [l] ON [l].[Level1_Optional_Id] = [e].[Id]
+        ORDER BY [e].[Name], [l].[Id]
+        OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
+    ) AS [t]
+) AS [l1] ON [l0].[OneToMany_Optional_InverseId] = [l1].[Id]
+ORDER BY [l1].[Name], [l1].[Id]",
+                    Sql);
+            }
+        }
+
+        public override void Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2()
+        {
+            base.Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2();
+
+            if (SupportsOffset)
+            {
+                Assert.Equal(
+                    @"@__p_0: ?
+@__p_1: ?
+
+SELECT [e].[Id], [e].[Date], [e].[Name], [e].[OneToMany_Optional_Self_InverseId], [e].[OneToMany_Required_Self_InverseId], [e].[OneToOne_Optional_SelfId], [l].[Id], [l].[Date], [l].[Level1_Optional_Id], [l].[Level1_Required_Id], [l].[Name], [l].[OneToMany_Optional_InverseId], [l].[OneToMany_Optional_Self_InverseId], [l].[OneToMany_Required_InverseId], [l].[OneToMany_Required_Self_InverseId], [l].[OneToOne_Optional_PK_InverseId], [l].[OneToOne_Optional_SelfId], [l0].[Id], [l0].[Level2_Optional_Id], [l0].[Level2_Required_Id], [l0].[Name], [l0].[OneToMany_Optional_InverseId], [l0].[OneToMany_Optional_Self_InverseId], [l0].[OneToMany_Required_InverseId], [l0].[OneToMany_Required_Self_InverseId], [l0].[OneToOne_Optional_PK_InverseId], [l0].[OneToOne_Optional_SelfId]
+FROM [Level1] AS [e]
+LEFT JOIN [Level2] AS [l] ON [l].[Level1_Optional_Id] = [e].[Id]
+LEFT JOIN [Level3] AS [l0] ON [l0].[Level2_Required_Id] = [l].[Id]
+ORDER BY [e].[Name], [l0].[Id]
+OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
+
+@__p_0: ?
+@__p_1: ?
+
+SELECT [l1].[Id], [l1].[Level3_Optional_Id], [l1].[Level3_Required_Id], [l1].[Name], [l1].[OneToMany_Optional_InverseId], [l1].[OneToMany_Optional_Self_InverseId], [l1].[OneToMany_Required_InverseId], [l1].[OneToMany_Required_Self_InverseId], [l1].[OneToOne_Optional_PK_InverseId], [l1].[OneToOne_Optional_SelfId]
+FROM [Level4] AS [l1]
+INNER JOIN (
+    SELECT DISTINCT [t].*
+    FROM (
+        SELECT [e].[Name], [l0].[Id]
+        FROM [Level1] AS [e]
+        LEFT JOIN [Level2] AS [l] ON [l].[Level1_Optional_Id] = [e].[Id]
+        LEFT JOIN [Level3] AS [l0] ON [l0].[Level2_Required_Id] = [l].[Id]
+        ORDER BY [e].[Name], [l0].[Id]
+        OFFSET @__p_0 ROWS FETCH NEXT @__p_1 ROWS ONLY
+    ) AS [t]
+) AS [l00] ON [l1].[OneToMany_Optional_InverseId] = [l00].[Id]
+ORDER BY [l00].[Name], [l00].[Id]",
+                    Sql);
+            }
+        }
+
         public override void Multiple_include_with_multiple_optional_navigations()
         {
             base.Multiple_include_with_multiple_optional_navigations();