Skip to content

Commit a588de8

Browse files
ranma42ranma42
committed
Update baselines
1 parent 68e274c commit a588de8

6 files changed

+47
-75
lines changed

‎test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServer160Test.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ where l1.Id < 3
6767
AssertSql(
6868
"""
6969
SELECT (
70-
SELECT TOP(1) [l1].[Name]
71-
FROM (
72-
SELECT TOP(1) [l0].[Id], [l0].[Name]
73-
FROM [LevelThree] AS [l0]
74-
) AS [l1]
75-
ORDER BY [l1].[Id])
70+
SELECT TOP(1) [l0].[Name]
71+
FROM [LevelThree] AS [l0])
7672
FROM [LevelOne] AS [l]
7773
WHERE [l].[Id] < 3
7874
""");

‎test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ where l1.Id < 3
6767
AssertSql(
6868
"""
6969
SELECT (
70-
SELECT TOP(1) [l1].[Name]
71-
FROM (
72-
SELECT TOP(1) [l0].[Id], [l0].[Name]
73-
FROM [LevelThree] AS [l0]
74-
) AS [l1]
75-
ORDER BY [l1].[Id])
70+
SELECT TOP(1) [l0].[Name]
71+
FROM [LevelThree] AS [l0])
7672
FROM [LevelOne] AS [l]
7773
WHERE [l].[Id] < 3
7874
""");

‎test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServer160Test.cs

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,25 @@ where l1.Id < 3
8585
AssertSql(
8686
"""
8787
SELECT (
88-
SELECT TOP(1) [s].[Level3_Name]
89-
FROM (
90-
SELECT TOP(1) [l4].[Id], [l4].[Level2_Required_Id], [l4].[Level3_Name], [l4].[OneToMany_Required_Inverse3Id]
91-
FROM [Level1] AS [l0]
92-
LEFT JOIN (
93-
SELECT [l1].[Id], [l1].[OneToOne_Required_PK_Date], [l1].[Level1_Required_Id], [l1].[OneToMany_Required_Inverse2Id]
94-
FROM [Level1] AS [l1]
95-
WHERE [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id] IS NOT NULL AND [l1].[OneToMany_Required_Inverse2Id] IS NOT NULL
96-
) AS [l2] ON [l0].[Id] = CASE
97-
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
98-
END
99-
LEFT JOIN (
100-
SELECT [l3].[Id], [l3].[Level2_Required_Id], [l3].[Level3_Name], [l3].[OneToMany_Required_Inverse3Id]
101-
FROM [Level1] AS [l3]
102-
WHERE [l3].[Level2_Required_Id] IS NOT NULL AND [l3].[OneToMany_Required_Inverse3Id] IS NOT NULL
103-
) AS [l4] ON CASE
104-
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
105-
END = CASE
106-
WHEN [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL THEN [l4].[Id]
107-
END
108-
WHERE [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL AND [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL
109-
) AS [s]
110-
ORDER BY CASE
111-
WHEN [s].[Level2_Required_Id] IS NOT NULL AND [s].[OneToMany_Required_Inverse3Id] IS NOT NULL THEN [s].[Id]
112-
END)
88+
SELECT TOP(1) [l4].[Level3_Name]
89+
FROM [Level1] AS [l0]
90+
LEFT JOIN (
91+
SELECT [l1].[Id], [l1].[OneToOne_Required_PK_Date], [l1].[Level1_Required_Id], [l1].[OneToMany_Required_Inverse2Id]
92+
FROM [Level1] AS [l1]
93+
WHERE [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id] IS NOT NULL AND [l1].[OneToMany_Required_Inverse2Id] IS NOT NULL
94+
) AS [l2] ON [l0].[Id] = CASE
95+
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
96+
END
97+
LEFT JOIN (
98+
SELECT [l3].[Id], [l3].[Level2_Required_Id], [l3].[Level3_Name], [l3].[OneToMany_Required_Inverse3Id]
99+
FROM [Level1] AS [l3]
100+
WHERE [l3].[Level2_Required_Id] IS NOT NULL AND [l3].[OneToMany_Required_Inverse3Id] IS NOT NULL
101+
) AS [l4] ON CASE
102+
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
103+
END = CASE
104+
WHEN [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL THEN [l4].[Id]
105+
END
106+
WHERE [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL AND [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL)
113107
FROM [Level1] AS [l]
114108
WHERE [l].[Id] < 3
115109
""");

‎test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServerTest.cs

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,25 @@ where l1.Id < 3
8787
AssertSql(
8888
"""
8989
SELECT (
90-
SELECT TOP(1) [s].[Level3_Name]
91-
FROM (
92-
SELECT TOP(1) [l4].[Id], [l4].[Level2_Required_Id], [l4].[Level3_Name], [l4].[OneToMany_Required_Inverse3Id]
93-
FROM [Level1] AS [l0]
94-
LEFT JOIN (
95-
SELECT [l1].[Id], [l1].[OneToOne_Required_PK_Date], [l1].[Level1_Required_Id], [l1].[OneToMany_Required_Inverse2Id]
96-
FROM [Level1] AS [l1]
97-
WHERE [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id] IS NOT NULL AND [l1].[OneToMany_Required_Inverse2Id] IS NOT NULL
98-
) AS [l2] ON [l0].[Id] = CASE
99-
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
100-
END
101-
LEFT JOIN (
102-
SELECT [l3].[Id], [l3].[Level2_Required_Id], [l3].[Level3_Name], [l3].[OneToMany_Required_Inverse3Id]
103-
FROM [Level1] AS [l3]
104-
WHERE [l3].[Level2_Required_Id] IS NOT NULL AND [l3].[OneToMany_Required_Inverse3Id] IS NOT NULL
105-
) AS [l4] ON CASE
106-
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
107-
END = CASE
108-
WHEN [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL THEN [l4].[Id]
109-
END
110-
WHERE [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL AND [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL
111-
) AS [s]
112-
ORDER BY CASE
113-
WHEN [s].[Level2_Required_Id] IS NOT NULL AND [s].[OneToMany_Required_Inverse3Id] IS NOT NULL THEN [s].[Id]
114-
END)
90+
SELECT TOP(1) [l4].[Level3_Name]
91+
FROM [Level1] AS [l0]
92+
LEFT JOIN (
93+
SELECT [l1].[Id], [l1].[OneToOne_Required_PK_Date], [l1].[Level1_Required_Id], [l1].[OneToMany_Required_Inverse2Id]
94+
FROM [Level1] AS [l1]
95+
WHERE [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id] IS NOT NULL AND [l1].[OneToMany_Required_Inverse2Id] IS NOT NULL
96+
) AS [l2] ON [l0].[Id] = CASE
97+
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
98+
END
99+
LEFT JOIN (
100+
SELECT [l3].[Id], [l3].[Level2_Required_Id], [l3].[Level3_Name], [l3].[OneToMany_Required_Inverse3Id]
101+
FROM [Level1] AS [l3]
102+
WHERE [l3].[Level2_Required_Id] IS NOT NULL AND [l3].[OneToMany_Required_Inverse3Id] IS NOT NULL
103+
) AS [l4] ON CASE
104+
WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l2].[Id]
105+
END = CASE
106+
WHEN [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL THEN [l4].[Id]
107+
END
108+
WHERE [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse2Id] IS NOT NULL AND [l4].[Level2_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse3Id] IS NOT NULL)
115109
FROM [Level1] AS [l]
116110
WHERE [l].[Id] < 3
117111
""");

‎test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -776,16 +776,14 @@ public override async Task Project_single_element_from_collection_with_OrderBy_T
776776
"""
777777
SELECT [o1].[OrderID], [o1].[CustomerID], [o1].[EmployeeID], [o1].[OrderDate]
778778
FROM [Customers] AS [c]
779-
OUTER APPLY (
780-
SELECT TOP(1) [o0].[OrderID], [o0].[CustomerID], [o0].[EmployeeID], [o0].[OrderDate]
779+
LEFT JOIN (
780+
SELECT [o0].[OrderID], [o0].[CustomerID], [o0].[EmployeeID], [o0].[OrderDate]
781781
FROM (
782-
SELECT TOP(1) [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate]
782+
SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate], ROW_NUMBER() OVER(PARTITION BY [o].[CustomerID] ORDER BY [o].[OrderID]) AS [row]
783783
FROM [Orders] AS [o]
784-
WHERE [c].[CustomerID] = [o].[CustomerID]
785-
ORDER BY [o].[OrderID]
786784
) AS [o0]
787-
ORDER BY [o0].[OrderDate]
788-
) AS [o1]
785+
WHERE [o0].[row] <= 1
786+
) AS [o1] ON [c].[CustomerID] = [o1].[CustomerID]
789787
""");
790788
}
791789

‎test/EFCore.Sqlite.FunctionalTests/Query/NorthwindSelectQuerySqliteTest.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,6 @@ public override async Task Reverse_in_SelectMany_with_Take(bool async)
275275
(await Assert.ThrowsAsync<InvalidOperationException>(
276276
() => base.Reverse_in_SelectMany_with_Take(async))).Message);
277277

278-
public override async Task Project_single_element_from_collection_with_OrderBy_over_navigation_Take_and_FirstOrDefault_2(bool async)
279-
=> Assert.Equal(
280-
SqliteStrings.ApplyNotSupported,
281-
(await Assert.ThrowsAsync<InvalidOperationException>(
282-
() => base.Project_single_element_from_collection_with_OrderBy_over_navigation_Take_and_FirstOrDefault_2(async))).Message);
283-
284278
public override Task Member_binding_after_ctor_arguments_fails_with_client_eval(bool async)
285279
=> AssertTranslationFailed(() => base.Member_binding_after_ctor_arguments_fails_with_client_eval(async));
286280

0 commit comments

Comments
 (0)