Skip to content

Commit 5b4b67b

Browse files
ranma42ranma42
committed
Update baselines
1 parent b996afe commit 5b4b67b

File tree

39 files changed

+495
-493
lines changed

39 files changed

+495
-493
lines changed

‎test/EFCore.SqlServer.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesSqlServerTest.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public override async Task Update_non_owned_property_on_entity_with_owned2(bool
9898
AssertSql(
9999
"""
100100
UPDATE [o]
101-
SET [o].[Title] = COALESCE([o].[Title], N'') + N'_Suffix'
101+
SET [o].[Title] = ISNULL([o].[Title], N'') + N'_Suffix'
102102
FROM [Owner] AS [o]
103103
""");
104104
}
@@ -125,7 +125,7 @@ public override async Task Update_owned_and_non_owned_properties_with_table_shar
125125
AssertSql(
126126
"""
127127
UPDATE [o]
128-
SET [o].[Title] = COALESCE(CONVERT(varchar(11), [o].[OwnedReference_Number]), ''),
128+
SET [o].[Title] = ISNULL(CONVERT(varchar(11), [o].[OwnedReference_Number]), ''),
129129
[o].[OwnedReference_Number] = CAST(LEN([o].[Title]) AS int)
130130
FROM [Owner] AS [o]
131131
""");
@@ -190,7 +190,7 @@ public override async Task Update_with_alias_uniquification_in_setter_subquery(b
190190
"""
191191
UPDATE [o]
192192
SET [o].[Total] = (
193-
SELECT COALESCE(SUM([o0].[Amount]), 0)
193+
SELECT ISNULL(SUM([o0].[Amount]), 0)
194194
FROM [OrderProduct] AS [o0]
195195
WHERE [o].[Id] = [o0].[OrderId])
196196
FROM [Orders] AS [o]

‎test/EFCore.SqlServer.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesSqlServerTest.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ public override async Task Update_Where_set_property_plus_constant(bool async)
11101110
AssertExecuteUpdateSql(
11111111
"""
11121112
UPDATE [c]
1113-
SET [c].[ContactName] = COALESCE([c].[ContactName], N'') + N'Abc'
1113+
SET [c].[ContactName] = ISNULL(CAST([c].[ContactName] AS nvarchar(4000)), N'') + N'Abc'
11141114
FROM [Customers] AS [c]
11151115
WHERE [c].[CustomerID] LIKE N'F%'
11161116
""");
@@ -1125,7 +1125,7 @@ public override async Task Update_Where_set_property_plus_parameter(bool async)
11251125
@value='Abc' (Size = 4000)
11261126
11271127
UPDATE [c]
1128-
SET [c].[ContactName] = COALESCE([c].[ContactName], N'') + @value
1128+
SET [c].[ContactName] = ISNULL(CAST([c].[ContactName] AS nvarchar(4000)), N'') + @value
11291129
FROM [Customers] AS [c]
11301130
WHERE [c].[CustomerID] LIKE N'F%'
11311131
""");
@@ -1138,7 +1138,7 @@ public override async Task Update_Where_set_property_plus_property(bool async)
11381138
AssertExecuteUpdateSql(
11391139
"""
11401140
UPDATE [c]
1141-
SET [c].[ContactName] = COALESCE([c].[ContactName], N'') + [c].[CustomerID]
1141+
SET [c].[ContactName] = ISNULL(CAST([c].[ContactName] AS nvarchar(4000)), N'') + [c].[CustomerID]
11421142
FROM [Customers] AS [c]
11431143
WHERE [c].[CustomerID] LIKE N'F%'
11441144
""");
@@ -1560,7 +1560,7 @@ public override async Task Update_Where_Join_set_property_from_joined_single_res
15601560
AssertExecuteUpdateSql(
15611561
"""
15621562
UPDATE [c]
1563-
SET [c].[City] = COALESCE(CONVERT(varchar(11), DATEPART(year, (
1563+
SET [c].[City] = ISNULL(CONVERT(varchar(11), DATEPART(year, (
15641564
SELECT TOP(1) [o].[OrderDate]
15651565
FROM [Orders] AS [o]
15661566
WHERE [c].[CustomerID] = [o].[CustomerID]
@@ -1595,7 +1595,7 @@ public override async Task Update_Where_Join_set_property_from_joined_single_res
15951595
AssertExecuteUpdateSql(
15961596
"""
15971597
UPDATE [c]
1598-
SET [c].[City] = COALESCE(CONVERT(varchar(11), DATEPART(year, (
1598+
SET [c].[City] = ISNULL(CONVERT(varchar(11), DATEPART(year, (
15991599
SELECT TOP(1) [o].[OrderDate]
16001600
FROM [Orders] AS [o]
16011601
WHERE [c].[CustomerID] = [o].[CustomerID]

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2202,7 +2202,7 @@ public override async Task Enum_with_value_converter_matching_take_value(bool as
22022202
@orderItemType='MyType1' (Nullable = false) (Size = 4000)
22032203
@p='1'
22042204
2205-
SELECT [o1].[Id], COALESCE((
2205+
SELECT [o1].[Id], ISNULL((
22062206
SELECT TOP(1) [o3].[Price]
22072207
FROM [OrderItems] AS [o3]
22082208
WHERE [o1].[Id] = [o3].[OrderId] AND [o3].[Type] = @orderItemType), 0.0E0) AS [SpecialSum]
@@ -2284,8 +2284,8 @@ public override async Task Group_by_aggregate_in_subquery_projection_after_group
22842284

22852285
AssertSql(
22862286
"""
2287-
SELECT [t].[Value] AS [A], COALESCE(SUM([t].[Id]), 0) AS [B], COALESCE((
2288-
SELECT TOP(1) COALESCE(SUM([t].[Id]), 0) + COALESCE(SUM([t0].[Id]), 0)
2287+
SELECT [t].[Value] AS [A], ISNULL(SUM([t].[Id]), 0) AS [B], ISNULL((
2288+
SELECT TOP(1) ISNULL(SUM([t].[Id]), 0) + ISNULL(SUM([t0].[Id]), 0)
22892289
FROM [Tables] AS [t0]
22902290
GROUP BY [t0].[Value]
22912291
ORDER BY (SELECT 1)), 0) AS [C]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -337,14 +337,14 @@ FROM [CompetitionSeasons] AS [c1]
337337
SELECT [a].[Id], [a].[ActivityTypeId], [a].[DateTime], [a].[Points], (
338338
SELECT TOP(1) [c].[Id]
339339
FROM [CompetitionSeasons] AS [c]
340-
WHERE [c].[StartDate] <= [a].[DateTime] AND [a].[DateTime] < [c].[EndDate]) AS [CompetitionSeasonId], COALESCE([a].[Points], (
340+
WHERE [c].[StartDate] <= [a].[DateTime] AND [a].[DateTime] < [c].[EndDate]) AS [CompetitionSeasonId], ISNULL(ISNULL([a].[Points], (
341341
SELECT TOP(1) [a1].[Points]
342342
FROM [ActivityTypePoints] AS [a1]
343343
INNER JOIN [CompetitionSeasons] AS [c0] ON [a1].[CompetitionSeasonId] = [c0].[Id]
344344
WHERE [a0].[Id] = [a1].[ActivityTypeId] AND [c0].[Id] = (
345345
SELECT TOP(1) [c1].[Id]
346346
FROM [CompetitionSeasons] AS [c1]
347-
WHERE [c1].[StartDate] <= [a].[DateTime] AND [a].[DateTime] < [c1].[EndDate])), 0) AS [Points]
347+
WHERE [c1].[StartDate] <= [a].[DateTime] AND [a].[DateTime] < [c1].[EndDate]))), 0) AS [Points]
348348
FROM [Activities] AS [a]
349349
INNER JOIN [ActivityType] AS [a0] ON [a].[ActivityTypeId] = [a0].[Id]
350350
""");

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ public override async Task Result_operator_nav_prop_reference_optional_Sum(bool
10991099

11001100
AssertSql(
11011101
"""
1102-
SELECT COALESCE(SUM([l0].[Level1_Required_Id]), 0)
1102+
SELECT ISNULL(SUM([l0].[Level1_Required_Id]), 0)
11031103
FROM [LevelOne] AS [l]
11041104
LEFT JOIN [LevelTwo] AS [l0] ON [l].[Id] = [l0].[Level1_Optional_Id]
11051105
""");
@@ -1171,7 +1171,7 @@ public override async Task Result_operator_nav_prop_reference_optional_via_Defau
11711171

11721172
AssertSql(
11731173
"""
1174-
SELECT COALESCE(SUM(CASE
1174+
SELECT ISNULL(SUM(CASE
11751175
WHEN [l0].[Id] IS NULL THEN 0
11761176
ELSE [l0].[Level1_Required_Id]
11771177
END), 0)
@@ -2031,7 +2031,7 @@ public override async Task Select_join_with_key_selector_being_a_subquery(bool a
20312031
"""
20322032
SELECT [l].[Id], [l].[Date], [l].[Name], [l].[OneToMany_Optional_Self_Inverse1Id], [l].[OneToMany_Required_Self_Inverse1Id], [l].[OneToOne_Optional_Self1Id], [l0].[Id], [l0].[Date], [l0].[Level1_Optional_Id], [l0].[Level1_Required_Id], [l0].[Name], [l0].[OneToMany_Optional_Inverse2Id], [l0].[OneToMany_Optional_Self_Inverse2Id], [l0].[OneToMany_Required_Inverse2Id], [l0].[OneToMany_Required_Self_Inverse2Id], [l0].[OneToOne_Optional_PK_Inverse2Id], [l0].[OneToOne_Optional_Self2Id]
20332033
FROM [LevelOne] AS [l]
2034-
INNER JOIN [LevelTwo] AS [l0] ON [l].[Id] = COALESCE((
2034+
INNER JOIN [LevelTwo] AS [l0] ON [l].[Id] = ISNULL((
20352035
SELECT TOP(1) [l1].[Id]
20362036
FROM [LevelTwo] AS [l1]
20372037
ORDER BY [l1].[Id]), 0)
@@ -2943,7 +2943,7 @@ public override async Task Select_optional_navigation_property_string_concat(boo
29432943

29442944
AssertSql(
29452945
"""
2946-
SELECT COALESCE([l].[Name], N'') + N' ' + COALESCE(CASE
2946+
SELECT ISNULL([l].[Name], N'') + N' ' + ISNULL(CASE
29472947
WHEN [l1].[Id] IS NOT NULL THEN [l1].[Name]
29482948
ELSE N'NULL'
29492949
END, N'')
@@ -3807,7 +3807,7 @@ public override async Task Sum_with_selector_cast_using_as(bool async)
38073807

38083808
AssertSql(
38093809
"""
3810-
SELECT COALESCE(SUM([l].[Id]), 0)
3810+
SELECT ISNULL(SUM([l].[Id]), 0)
38113811
FROM [LevelOne] AS [l]
38123812
""");
38133813
}
@@ -3821,7 +3821,7 @@ public override async Task Sum_with_filter_with_include_selector_cast_using_as(b
38213821
SELECT [l].[Id], [l].[Date], [l].[Name], [l].[OneToMany_Optional_Self_Inverse1Id], [l].[OneToMany_Required_Self_Inverse1Id], [l].[OneToOne_Optional_Self1Id]
38223822
FROM [LevelOne] AS [l]
38233823
WHERE [l].[Id] > (
3824-
SELECT COALESCE(SUM([l0].[Id]), 0)
3824+
SELECT ISNULL(SUM([l0].[Id]), 0)
38253825
FROM [LevelTwo] AS [l0]
38263826
WHERE [l].[Id] = [l0].[OneToMany_Optional_Inverse2Id])
38273827
""");
@@ -3965,7 +3965,7 @@ FROM [LevelOne] AS [l]
39653965
LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Id]
39663966
GROUP BY [l1].[Name]
39673967
HAVING (
3968-
SELECT MIN(COALESCE([l5].[Id], 0) + COALESCE([l5].[Id], 0))
3968+
SELECT MIN(ISNULL([l5].[Id], 0) + ISNULL([l5].[Id], 0))
39693969
FROM [LevelOne] AS [l2]
39703970
LEFT JOIN [LevelTwo] AS [l3] ON [l2].[Id] = [l3].[Id]
39713971
LEFT JOIN [LevelThree] AS [l4] ON [l3].[Id] = [l4].[Id]
@@ -4106,7 +4106,7 @@ public override async Task Composite_key_join_on_groupby_aggregate_projecting_on
41064106
SELECT [l2].[Key]
41074107
FROM [LevelOne] AS [l]
41084108
INNER JOIN (
4109-
SELECT [l1].[Key], COALESCE(SUM([l1].[Id]), 0) AS [Sum]
4109+
SELECT [l1].[Key], ISNULL(SUM([l1].[Id]), 0) AS [Sum]
41104110
FROM (
41114111
SELECT [l0].[Id], [l0].[Id] % 3 AS [Key]
41124112
FROM [LevelTwo] AS [l0]
@@ -4125,7 +4125,7 @@ public override async Task Composite_key_join_on_groupby_aggregate_projecting_on
41254125
SELECT [l2].[Key]
41264126
FROM [LevelOne] AS [l]
41274127
INNER JOIN (
4128-
SELECT [l1].[Key], COALESCE(SUM([l1].[Id]), 0) AS [Sum]
4128+
SELECT [l1].[Key], ISNULL(SUM([l1].[Id]), 0) AS [Sum]
41294129
FROM (
41304130
SELECT [l0].[Id], [l0].[Id] % 3 AS [Key]
41314131
FROM [LevelTwo] AS [l0]
@@ -4341,7 +4341,7 @@ WHERE [l].[Id] < 5
43414341
CROSS APPLY (
43424342
SELECT [l1].[Id], [l1].[Date], [l1].[Name], [l1].[OneToMany_Optional_Self_Inverse1Id], [l1].[OneToMany_Required_Self_Inverse1Id], [l1].[OneToOne_Optional_Self1Id]
43434343
FROM [LevelOne] AS [l1]
4344-
WHERE [l1].[Id] <> COALESCE([l0].[Level1_Required_Id], 0)
4344+
WHERE [l1].[Id] <> ISNULL([l0].[Level1_Required_Id], 0)
43454345
) AS [l2]
43464346
""");
43474347
}
@@ -4449,7 +4449,7 @@ FROM [LevelOne] AS [l]
44494449
LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Id]
44504450
GROUP BY [l1].[Name]
44514451
HAVING (
4452-
SELECT MIN(COALESCE([l5].[Id], 0))
4452+
SELECT MIN(ISNULL([l5].[Id], 0))
44534453
FROM [LevelOne] AS [l2]
44544454
LEFT JOIN [LevelTwo] AS [l3] ON [l2].[Id] = [l3].[Id]
44554455
LEFT JOIN [LevelThree] AS [l4] ON [l3].[Id] = [l4].[Id]
@@ -4831,7 +4831,7 @@ ORDER BY [l].[Id]
48314831
) AS [l4]
48324832
LEFT JOIN (
48334833
SELECT [l0].[Id], [l1].[Id] AS [Id0], [l2].[Id] AS [Id1], CASE
4834-
WHEN COALESCE((
4834+
WHEN ISNULL((
48354835
SELECT MAX([l3].[Id])
48364836
FROM [LevelFour] AS [l3]
48374837
WHERE [l1].[Id] IS NOT NULL AND [l1].[Id] = [l3].[OneToMany_Optional_Inverse4Id]), 0) > 1 THEN CAST(1 AS bit)

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ public override async Task Result_operator_nav_prop_reference_optional_Sum(bool
10991099

11001100
AssertSql(
11011101
"""
1102-
SELECT COALESCE(SUM([l0].[Level1_Required_Id]), 0)
1102+
SELECT ISNULL(SUM([l0].[Level1_Required_Id]), 0)
11031103
FROM [LevelOne] AS [l]
11041104
LEFT JOIN [LevelTwo] AS [l0] ON [l].[Id] = [l0].[Level1_Optional_Id]
11051105
""");
@@ -1171,7 +1171,7 @@ public override async Task Result_operator_nav_prop_reference_optional_via_Defau
11711171

11721172
AssertSql(
11731173
"""
1174-
SELECT COALESCE(SUM(CASE
1174+
SELECT ISNULL(SUM(CASE
11751175
WHEN [l0].[Id] IS NULL THEN 0
11761176
ELSE [l0].[Level1_Required_Id]
11771177
END), 0)
@@ -2031,7 +2031,7 @@ public override async Task Select_join_with_key_selector_being_a_subquery(bool a
20312031
"""
20322032
SELECT [l].[Id], [l].[Date], [l].[Name], [l].[OneToMany_Optional_Self_Inverse1Id], [l].[OneToMany_Required_Self_Inverse1Id], [l].[OneToOne_Optional_Self1Id], [l0].[Id], [l0].[Date], [l0].[Level1_Optional_Id], [l0].[Level1_Required_Id], [l0].[Name], [l0].[OneToMany_Optional_Inverse2Id], [l0].[OneToMany_Optional_Self_Inverse2Id], [l0].[OneToMany_Required_Inverse2Id], [l0].[OneToMany_Required_Self_Inverse2Id], [l0].[OneToOne_Optional_PK_Inverse2Id], [l0].[OneToOne_Optional_Self2Id]
20332033
FROM [LevelOne] AS [l]
2034-
INNER JOIN [LevelTwo] AS [l0] ON [l].[Id] = COALESCE((
2034+
INNER JOIN [LevelTwo] AS [l0] ON [l].[Id] = ISNULL((
20352035
SELECT TOP(1) [l1].[Id]
20362036
FROM [LevelTwo] AS [l1]
20372037
ORDER BY [l1].[Id]), 0)
@@ -2943,7 +2943,7 @@ public override async Task Select_optional_navigation_property_string_concat(boo
29432943

29442944
AssertSql(
29452945
"""
2946-
SELECT COALESCE([l].[Name], N'') + N' ' + COALESCE(CASE
2946+
SELECT ISNULL([l].[Name], N'') + N' ' + ISNULL(CASE
29472947
WHEN [l1].[Id] IS NOT NULL THEN [l1].[Name]
29482948
ELSE N'NULL'
29492949
END, N'')
@@ -3807,7 +3807,7 @@ public override async Task Sum_with_selector_cast_using_as(bool async)
38073807

38083808
AssertSql(
38093809
"""
3810-
SELECT COALESCE(SUM([l].[Id]), 0)
3810+
SELECT ISNULL(SUM([l].[Id]), 0)
38113811
FROM [LevelOne] AS [l]
38123812
""");
38133813
}
@@ -3821,7 +3821,7 @@ public override async Task Sum_with_filter_with_include_selector_cast_using_as(b
38213821
SELECT [l].[Id], [l].[Date], [l].[Name], [l].[OneToMany_Optional_Self_Inverse1Id], [l].[OneToMany_Required_Self_Inverse1Id], [l].[OneToOne_Optional_Self1Id]
38223822
FROM [LevelOne] AS [l]
38233823
WHERE [l].[Id] > (
3824-
SELECT COALESCE(SUM([l0].[Id]), 0)
3824+
SELECT ISNULL(SUM([l0].[Id]), 0)
38253825
FROM [LevelTwo] AS [l0]
38263826
WHERE [l].[Id] = [l0].[OneToMany_Optional_Inverse2Id])
38273827
""");
@@ -3965,7 +3965,7 @@ FROM [LevelOne] AS [l]
39653965
LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Id]
39663966
GROUP BY [l1].[Name]
39673967
HAVING (
3968-
SELECT MIN(COALESCE([l5].[Id], 0) + COALESCE([l5].[Id], 0))
3968+
SELECT MIN(ISNULL([l5].[Id], 0) + ISNULL([l5].[Id], 0))
39693969
FROM [LevelOne] AS [l2]
39703970
LEFT JOIN [LevelTwo] AS [l3] ON [l2].[Id] = [l3].[Id]
39713971
LEFT JOIN [LevelThree] AS [l4] ON [l3].[Id] = [l4].[Id]
@@ -4106,7 +4106,7 @@ public override async Task Composite_key_join_on_groupby_aggregate_projecting_on
41064106
SELECT [l2].[Key]
41074107
FROM [LevelOne] AS [l]
41084108
INNER JOIN (
4109-
SELECT [l1].[Key], COALESCE(SUM([l1].[Id]), 0) AS [Sum]
4109+
SELECT [l1].[Key], ISNULL(SUM([l1].[Id]), 0) AS [Sum]
41104110
FROM (
41114111
SELECT [l0].[Id], [l0].[Id] % 3 AS [Key]
41124112
FROM [LevelTwo] AS [l0]
@@ -4125,7 +4125,7 @@ public override async Task Composite_key_join_on_groupby_aggregate_projecting_on
41254125
SELECT [l2].[Key]
41264126
FROM [LevelOne] AS [l]
41274127
INNER JOIN (
4128-
SELECT [l1].[Key], COALESCE(SUM([l1].[Id]), 0) AS [Sum]
4128+
SELECT [l1].[Key], ISNULL(SUM([l1].[Id]), 0) AS [Sum]
41294129
FROM (
41304130
SELECT [l0].[Id], [l0].[Id] % 3 AS [Key]
41314131
FROM [LevelTwo] AS [l0]
@@ -4341,7 +4341,7 @@ WHERE [l].[Id] < 5
43414341
CROSS APPLY (
43424342
SELECT [l1].[Id], [l1].[Date], [l1].[Name], [l1].[OneToMany_Optional_Self_Inverse1Id], [l1].[OneToMany_Required_Self_Inverse1Id], [l1].[OneToOne_Optional_Self1Id]
43434343
FROM [LevelOne] AS [l1]
4344-
WHERE [l1].[Id] <> COALESCE([l0].[Level1_Required_Id], 0)
4344+
WHERE [l1].[Id] <> ISNULL([l0].[Level1_Required_Id], 0)
43454345
) AS [l2]
43464346
""");
43474347
}
@@ -4449,7 +4449,7 @@ FROM [LevelOne] AS [l]
44494449
LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Id]
44504450
GROUP BY [l1].[Name]
44514451
HAVING (
4452-
SELECT MIN(COALESCE([l5].[Id], 0))
4452+
SELECT MIN(ISNULL([l5].[Id], 0))
44534453
FROM [LevelOne] AS [l2]
44544454
LEFT JOIN [LevelTwo] AS [l3] ON [l2].[Id] = [l3].[Id]
44554455
LEFT JOIN [LevelThree] AS [l4] ON [l3].[Id] = [l4].[Id]
@@ -4831,7 +4831,7 @@ ORDER BY [l].[Id]
48314831
) AS [l4]
48324832
LEFT JOIN (
48334833
SELECT [l0].[Id], [l1].[Id] AS [Id0], [l2].[Id] AS [Id1], CASE
4834-
WHEN COALESCE((
4834+
WHEN ISNULL((
48354835
SELECT MAX([l3].[Id])
48364836
FROM [LevelFour] AS [l3]
48374837
WHERE [l1].[Id] IS NOT NULL AND [l1].[Id] = [l3].[OneToMany_Optional_Inverse4Id]), 0) > 1 THEN CAST(1 AS bit)

0 commit comments

Comments
 (0)