Skip to content

Commit c9dd9a7

Browse files
committed
Update baselines
1 parent f4387c6 commit c9dd9a7

35 files changed

+516
-516
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public override async Task Update_non_owned_property_on_entity_with_owned2(bool
9494
AssertSql(
9595
"""
9696
UPDATE [o]
97-
SET [o].[Title] = COALESCE([o].[Title], N'') + N'_Suffix'
97+
SET [o].[Title] = ISNULL([o].[Title], N'') + N'_Suffix'
9898
FROM [Owner] AS [o]
9999
""");
100100
}
@@ -184,7 +184,7 @@ public override async Task Update_with_alias_uniquification_in_setter_subquery(b
184184
"""
185185
UPDATE [o]
186186
SET [o].[Total] = (
187-
SELECT COALESCE(SUM([o0].[Amount]), 0)
187+
SELECT ISNULL(SUM([o0].[Amount]), 0)
188188
FROM [OrderProduct] AS [o0]
189189
WHERE [o].[Id] = [o0].[OrderId])
190190
FROM [Orders] AS [o]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ public override async Task Update_Where_set_property_plus_constant(bool async)
10241024
AssertExecuteUpdateSql(
10251025
"""
10261026
UPDATE [c]
1027-
SET [c].[ContactName] = COALESCE([c].[ContactName], N'') + N'Abc'
1027+
SET [c].[ContactName] = ISNULL([c].[ContactName], N'') + N'Abc'
10281028
FROM [Customers] AS [c]
10291029
WHERE [c].[CustomerID] LIKE N'F%'
10301030
""");
@@ -1035,11 +1035,11 @@ public override async Task Update_Where_set_property_plus_parameter(bool async)
10351035
await base.Update_Where_set_property_plus_parameter(async);
10361036

10371037
AssertExecuteUpdateSql(
1038-
"""
1038+
"""
10391039
@__value_0='Abc' (Size = 4000)
10401040
10411041
UPDATE [c]
1042-
SET [c].[ContactName] = COALESCE([c].[ContactName], N'') + @__value_0
1042+
SET [c].[ContactName] = ISNULL([c].[ContactName], N'') + @__value_0
10431043
FROM [Customers] AS [c]
10441044
WHERE [c].[CustomerID] LIKE N'F%'
10451045
""");
@@ -1052,7 +1052,7 @@ public override async Task Update_Where_set_property_plus_property(bool async)
10521052
AssertExecuteUpdateSql(
10531053
"""
10541054
UPDATE [c]
1055-
SET [c].[ContactName] = COALESCE([c].[ContactName], N'') + [c].[CustomerID]
1055+
SET [c].[ContactName] = ISNULL([c].[ContactName], N'') + [c].[CustomerID]
10561056
FROM [Customers] AS [c]
10571057
WHERE [c].[CustomerID] LIKE N'F%'
10581058
""");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2191,7 +2191,7 @@ public override async Task Enum_with_value_converter_matching_take_value(bool as
21912191
@__orderItemType_1='MyType1' (Nullable = false) (Size = 4000)
21922192
@__p_0='1'
21932193
2194-
SELECT [o1].[Id], COALESCE((
2194+
SELECT [o1].[Id], ISNULL((
21952195
SELECT TOP(1) [o3].[Price]
21962196
FROM [OrderItems] AS [o3]
21972197
WHERE [o1].[Id] = [o3].[OrderId] AND [o3].[Type] = @__orderItemType_1), 0.0E0) AS [SpecialSum]
@@ -2273,8 +2273,8 @@ public override async Task Group_by_aggregate_in_subquery_projection_after_group
22732273

22742274
AssertSql(
22752275
"""
2276-
SELECT [t].[Value] AS [A], COALESCE(SUM([t].[Id]), 0) AS [B], COALESCE((
2277-
SELECT TOP(1) COALESCE(SUM([t].[Id]), 0) + COALESCE(SUM([t0].[Id]), 0)
2276+
SELECT [t].[Value] AS [A], ISNULL(SUM([t].[Id]), 0) AS [B], ISNULL((
2277+
SELECT TOP(1) ISNULL(SUM([t].[Id]), 0) + ISNULL(SUM([t0].[Id]), 0)
22782278
FROM [Tables] AS [t0]
22792279
GROUP BY [t0].[Value]
22802280
ORDER BY (SELECT 1)), 0) AS [C]

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

Lines changed: 2 additions & 2 deletions
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/ComplexNavigationsQuerySqlServerTest.cs

Lines changed: 13 additions & 13 deletions
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'')
@@ -3808,7 +3808,7 @@ public override async Task Sum_with_selector_cast_using_as(bool async)
38083808

38093809
AssertSql(
38103810
"""
3811-
SELECT COALESCE(SUM([l].[Id]), 0)
3811+
SELECT ISNULL(SUM([l].[Id]), 0)
38123812
FROM [LevelOne] AS [l]
38133813
""");
38143814
}
@@ -3822,7 +3822,7 @@ public override async Task Sum_with_filter_with_include_selector_cast_using_as(b
38223822
SELECT [l].[Id], [l].[Date], [l].[Name], [l].[OneToMany_Optional_Self_Inverse1Id], [l].[OneToMany_Required_Self_Inverse1Id], [l].[OneToOne_Optional_Self1Id]
38233823
FROM [LevelOne] AS [l]
38243824
WHERE [l].[Id] > (
3825-
SELECT COALESCE(SUM([l0].[Id]), 0)
3825+
SELECT ISNULL(SUM([l0].[Id]), 0)
38263826
FROM [LevelTwo] AS [l0]
38273827
WHERE [l].[Id] = [l0].[OneToMany_Optional_Inverse2Id])
38283828
""");
@@ -3966,7 +3966,7 @@ FROM [LevelOne] AS [l]
39663966
LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Id]
39673967
GROUP BY [l1].[Name]
39683968
HAVING (
3969-
SELECT MIN(COALESCE([l5].[Id], 0) + COALESCE([l5].[Id], 0))
3969+
SELECT MIN(ISNULL([l5].[Id], 0) + ISNULL([l5].[Id], 0))
39703970
FROM [LevelOne] AS [l2]
39713971
LEFT JOIN [LevelTwo] AS [l3] ON [l2].[Id] = [l3].[Id]
39723972
LEFT JOIN [LevelThree] AS [l4] ON [l3].[Id] = [l4].[Id]
@@ -3981,7 +3981,7 @@ public override async Task Nested_object_constructed_from_group_key_properties(b
39813981

39823982
AssertSql(
39833983
"""
3984-
SELECT [l].[Id], [l].[Name], [l].[Date], [l0].[Id], [l1].[Name], [l0].[Date], [l0].[Level1_Optional_Id], [l0].[Level1_Required_Id], COALESCE(SUM(CAST(LEN([l].[Name]) AS int)), 0) AS [Aggregate]
3984+
SELECT [l].[Id], [l].[Name], [l].[Date], [l0].[Id], [l1].[Name], [l0].[Date], [l0].[Level1_Optional_Id], [l0].[Level1_Required_Id], ISNULL(SUM(CAST(LEN([l].[Name]) AS int)), 0) AS [Aggregate]
39853985
FROM [LevelOne] AS [l]
39863986
LEFT JOIN [LevelTwo] AS [l0] ON [l].[Id] = [l0].[Level1_Optional_Id]
39873987
LEFT JOIN [LevelTwo] AS [l1] ON [l].[Id] = [l1].[Level1_Required_Id]
@@ -4107,7 +4107,7 @@ public override async Task Composite_key_join_on_groupby_aggregate_projecting_on
41074107
SELECT [l2].[Key]
41084108
FROM [LevelOne] AS [l]
41094109
INNER JOIN (
4110-
SELECT [l1].[Key], COALESCE(SUM([l1].[Id]), 0) AS [Sum]
4110+
SELECT [l1].[Key], ISNULL(SUM([l1].[Id]), 0) AS [Sum]
41114111
FROM (
41124112
SELECT [l0].[Id], [l0].[Id] % 3 AS [Key]
41134113
FROM [LevelTwo] AS [l0]
@@ -4126,7 +4126,7 @@ public override async Task Composite_key_join_on_groupby_aggregate_projecting_on
41264126
SELECT [l2].[Key]
41274127
FROM [LevelOne] AS [l]
41284128
INNER JOIN (
4129-
SELECT [l1].[Key], COALESCE(SUM([l1].[Id]), 0) AS [Sum]
4129+
SELECT [l1].[Key], ISNULL(SUM([l1].[Id]), 0) AS [Sum]
41304130
FROM (
41314131
SELECT [l0].[Id], [l0].[Id] % 3 AS [Key]
41324132
FROM [LevelTwo] AS [l0]
@@ -4342,7 +4342,7 @@ WHERE [l].[Id] < 5
43424342
CROSS APPLY (
43434343
SELECT [l1].[Id], [l1].[Date], [l1].[Name], [l1].[OneToMany_Optional_Self_Inverse1Id], [l1].[OneToMany_Required_Self_Inverse1Id], [l1].[OneToOne_Optional_Self1Id]
43444344
FROM [LevelOne] AS [l1]
4345-
WHERE [l1].[Id] <> COALESCE([l0].[Level1_Required_Id], 0)
4345+
WHERE [l1].[Id] <> ISNULL([l0].[Level1_Required_Id], 0)
43464346
) AS [l2]
43474347
""");
43484348
}
@@ -4450,7 +4450,7 @@ FROM [LevelOne] AS [l]
44504450
LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Id]
44514451
GROUP BY [l1].[Name]
44524452
HAVING (
4453-
SELECT MIN(COALESCE([l5].[Id], 0))
4453+
SELECT MIN(ISNULL([l5].[Id], 0))
44544454
FROM [LevelOne] AS [l2]
44554455
LEFT JOIN [LevelTwo] AS [l3] ON [l2].[Id] = [l3].[Id]
44564456
LEFT JOIN [LevelThree] AS [l4] ON [l3].[Id] = [l4].[Id]
@@ -4832,7 +4832,7 @@ ORDER BY [l].[Id]
48324832
) AS [l4]
48334833
LEFT JOIN (
48344834
SELECT [l0].[Id], [l1].[Id] AS [Id0], [l2].[Id] AS [Id1], CASE
4835-
WHEN COALESCE((
4835+
WHEN ISNULL((
48364836
SELECT MAX([l3].[Id])
48374837
FROM [LevelFour] AS [l3]
48384838
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/ComplexNavigationsSharedTypeQuerySqlServerTest.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ WHEN [l3].[Level2_Required_Id] IS NOT NULL AND [l3].[OneToMany_Required_Inverse3
226226
END
227227
GROUP BY [l3].[Level3_Name]
228228
HAVING (
229-
SELECT MIN(COALESCE(CASE
229+
SELECT MIN(ISNULL(CASE
230230
WHEN [l10].[OneToOne_Required_PK_Date] IS NOT NULL AND [l10].[Level1_Required_Id] IS NOT NULL AND [l10].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l10].[Id]
231231
END, 0))
232232
FROM [Level1] AS [l4]
@@ -370,7 +370,7 @@ public override async Task Result_operator_nav_prop_reference_optional_via_Defau
370370

371371
AssertSql(
372372
"""
373-
SELECT COALESCE(SUM(CASE
373+
SELECT ISNULL(SUM(CASE
374374
WHEN [s].[OneToOne_Required_PK_Date] IS NULL OR [s].[Level1_Required_Id] IS NULL OR [s].[OneToMany_Required_Inverse2Id] IS NULL THEN 0
375375
ELSE [s].[Level1_Required_Id]
376376
END), 0)
@@ -539,9 +539,9 @@ WHEN [l3].[Level2_Required_Id] IS NOT NULL AND [l3].[OneToMany_Required_Inverse3
539539
END
540540
GROUP BY [l3].[Level3_Name]
541541
HAVING (
542-
SELECT MIN(COALESCE(CASE
542+
SELECT MIN(ISNULL(CASE
543543
WHEN [l10].[OneToOne_Required_PK_Date] IS NOT NULL AND [l10].[Level1_Required_Id] IS NOT NULL AND [l10].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l10].[Id]
544-
END, 0) + COALESCE(CASE
544+
END, 0) + ISNULL(CASE
545545
WHEN [l10].[OneToOne_Required_PK_Date] IS NOT NULL AND [l10].[Level1_Required_Id] IS NOT NULL AND [l10].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l10].[Id]
546546
END, 0))
547547
FROM [Level1] AS [l4]
@@ -578,7 +578,7 @@ public override async Task Sum_with_selector_cast_using_as(bool async)
578578

579579
AssertSql(
580580
"""
581-
SELECT COALESCE(SUM([l].[Id]), 0)
581+
SELECT ISNULL(SUM([l].[Id]), 0)
582582
FROM [Level1] AS [l]
583583
""");
584584
}
@@ -592,7 +592,7 @@ public override async Task Sum_with_filter_with_include_selector_cast_using_as(b
592592
SELECT [l].[Id], [l].[Date], [l].[Name]
593593
FROM [Level1] AS [l]
594594
WHERE [l].[Id] > (
595-
SELECT COALESCE(SUM(CASE
595+
SELECT ISNULL(SUM(CASE
596596
WHEN [l0].[OneToOne_Required_PK_Date] IS NOT NULL AND [l0].[Level1_Required_Id] IS NOT NULL AND [l0].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l0].[Id]
597597
END), 0)
598598
FROM [Level1] AS [l0]
@@ -783,7 +783,7 @@ public override async Task Nested_object_constructed_from_group_key_properties(b
783783

784784
AssertSql(
785785
"""
786-
SELECT [s].[Id], [s].[Name], [s].[Date], [s].[InnerId] AS [Id], [s].[Level2_Name0] AS [Name], [s].[OneToOne_Required_PK_Date] AS [Date], [s].[Level1_Optional_Id], [s].[Level1_Required_Id], COALESCE(SUM(CAST(LEN([s].[Name]) AS int)), 0) AS [Aggregate]
786+
SELECT [s].[Id], [s].[Name], [s].[Date], [s].[InnerId] AS [Id], [s].[Level2_Name0] AS [Name], [s].[OneToOne_Required_PK_Date] AS [Date], [s].[Level1_Optional_Id], [s].[Level1_Required_Id], ISNULL(SUM(CAST(LEN([s].[Name]) AS int)), 0) AS [Aggregate]
787787
FROM (
788788
SELECT [l].[Id], [l].[Date], [l].[Name], [l1].[OneToOne_Required_PK_Date], [l1].[Level1_Optional_Id], [l1].[Level1_Required_Id], [l3].[Level2_Name] AS [Level2_Name0], CASE
789789
WHEN [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id] IS NOT NULL AND [l1].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l1].[Id]
@@ -879,7 +879,7 @@ SELECT [s1].[Key]
879879
FROM [Level1] AS [l]
880880
INNER JOIN (
881881
SELECT [s].[Key], (
882-
SELECT COALESCE(SUM(CASE
882+
SELECT ISNULL(SUM(CASE
883883
WHEN [l7].[OneToOne_Required_PK_Date] IS NOT NULL AND [l7].[Level1_Required_Id] IS NOT NULL AND [l7].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l7].[Id]
884884
END), 0)
885885
FROM (
@@ -933,7 +933,7 @@ SELECT [s1].[Key]
933933
FROM [Level1] AS [l]
934934
INNER JOIN (
935935
SELECT [s].[Key], (
936-
SELECT COALESCE(SUM(CASE
936+
SELECT ISNULL(SUM(CASE
937937
WHEN [l7].[OneToOne_Required_PK_Date] IS NOT NULL AND [l7].[Level1_Required_Id] IS NOT NULL AND [l7].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l7].[Id]
938938
END), 0)
939939
FROM (
@@ -1620,7 +1620,7 @@ WHERE [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id]
16201620
CROSS APPLY (
16211621
SELECT [l2].[Id], [l2].[Date], [l2].[Name]
16221622
FROM [Level1] AS [l2]
1623-
WHERE [l2].[Id] <> COALESCE([s].[Level1_Required_Id], 0)
1623+
WHERE [l2].[Id] <> ISNULL([s].[Level1_Required_Id], 0)
16241624
) AS [l3]
16251625
""");
16261626
}
@@ -1906,7 +1906,7 @@ WHERE [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id]
19061906
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]
19071907
END
19081908
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
1909-
) AS [s] ON [l].[Id] = COALESCE((
1909+
) AS [s] ON [l].[Id] = ISNULL((
19101910
SELECT TOP(1) CASE
19111911
WHEN [l5].[OneToOne_Required_PK_Date] IS NOT NULL AND [l5].[Level1_Required_Id] IS NOT NULL AND [l5].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l5].[Id]
19121912
END
@@ -3650,7 +3650,7 @@ public override async Task Result_operator_nav_prop_reference_optional_Sum(bool
36503650

36513651
AssertSql(
36523652
"""
3653-
SELECT COALESCE(SUM([l1].[Level1_Required_Id]), 0)
3653+
SELECT ISNULL(SUM([l1].[Level1_Required_Id]), 0)
36543654
FROM [Level1] AS [l]
36553655
LEFT JOIN (
36563656
SELECT [l0].[Level1_Optional_Id], [l0].[Level1_Required_Id]
@@ -5898,7 +5898,7 @@ public override async Task Select_optional_navigation_property_string_concat(boo
58985898

58995899
AssertSql(
59005900
"""
5901-
SELECT COALESCE([l].[Name], N'') + N' ' + COALESCE(CASE
5901+
SELECT ISNULL([l].[Name], N'') + N' ' + ISNULL(CASE
59025902
WHEN [l1].[OneToOne_Required_PK_Date] IS NOT NULL AND [l1].[Level1_Required_Id] IS NOT NULL AND [l1].[OneToMany_Required_Inverse2Id] IS NOT NULL THEN [l1].[Level2_Name]
59035903
ELSE N'NULL'
59045904
END, N'')
@@ -8388,7 +8388,7 @@ WHEN [l2].[Level2_Required_Id] IS NOT NULL AND [l2].[OneToMany_Required_Inverse3
83888388
END AS [Id0], CASE
83898389
WHEN [l4].[Level3_Required_Id] IS NOT NULL AND [l4].[OneToMany_Required_Inverse4Id] IS NOT NULL THEN [l4].[Id]
83908390
END AS [Id1], CASE
8391-
WHEN COALESCE((
8391+
WHEN ISNULL((
83928392
SELECT MAX(CASE
83938393
WHEN [l5].[Level3_Required_Id] IS NOT NULL AND [l5].[OneToMany_Required_Inverse4Id] IS NOT NULL THEN [l5].[Id]
83948394
END)

test/EFCore.SqlServer.FunctionalTests/Query/Ef6GroupBySqlServerTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public override async Task Grouping_by_all_columns_with_aggregate_function_works
413413

414414
AssertSql(
415415
"""
416-
SELECT [a].[Id], COALESCE(SUM([a].[Id]), 0) AS [Sum], COUNT(*) AS [Count]
416+
SELECT [a].[Id], ISNULL(SUM([a].[Id]), 0) AS [Sum], COUNT(*) AS [Count]
417417
FROM [ArubaOwner] AS [a]
418418
GROUP BY [a].[Id], [a].[Alias], [a].[FirstName], [a].[LastName]
419419
""");
@@ -722,7 +722,7 @@ ORDER BY [p].[FirstName]
722722
LEFT JOIN (
723723
SELECT [p2].[FirstName], [p2].[FullName], [p2].[c]
724724
FROM (
725-
SELECT [p0].[FirstName], COALESCE([p0].[FirstName], N'') + N' ' + COALESCE([p0].[MiddleInitial], N'') + N' ' + COALESCE([p0].[LastName], N'') AS [FullName], 1 AS [c], ROW_NUMBER() OVER(PARTITION BY [p0].[FirstName] ORDER BY [p0].[Id]) AS [row]
725+
SELECT [p0].[FirstName], ISNULL([p0].[FirstName], N'') + N' ' + ISNULL([p0].[MiddleInitial], N'') + N' ' + ISNULL([p0].[LastName], N'') AS [FullName], 1 AS [c], ROW_NUMBER() OVER(PARTITION BY [p0].[FirstName] ORDER BY [p0].[Id]) AS [row]
726726
FROM [Person] AS [p0]
727727
) AS [p2]
728728
WHERE [p2].[row] <= 1
@@ -785,7 +785,7 @@ public override async Task Sum_Grouped_from_LINQ_101(bool async)
785785

786786
AssertSql(
787787
"""
788-
SELECT [p].[Category], COALESCE(SUM([p].[UnitsInStock]), 0) AS [TotalUnitsInStock]
788+
SELECT [p].[Category], ISNULL(SUM([p].[UnitsInStock]), 0) AS [TotalUnitsInStock]
789789
FROM [ProductForLinq] AS [p]
790790
GROUP BY [p].[Category]
791791
""");
@@ -810,7 +810,7 @@ public override async Task Whats_new_2021_sample_9(bool async)
810810
AssertSql(
811811
"""
812812
SELECT [p].[FirstName] AS [Feet], (
813-
SELECT COALESCE(SUM([f].[Size]), 0)
813+
SELECT ISNULL(SUM([f].[Size]), 0)
814814
FROM [Person] AS [p0]
815815
LEFT JOIN [Feet] AS [f] ON [p0].[Id] = [f].[Id]
816816
WHERE [p].[FirstName] = [p0].[FirstName] OR ([p].[FirstName] IS NULL AND [p0].[FirstName] IS NULL)) AS [Total]

0 commit comments

Comments
 (0)