Skip to content

Commit afcfba2

Browse files
ranma42ranma42
committed
Update baselines
1 parent 4e1a381 commit afcfba2

File tree

6 files changed

+30
-120
lines changed

6 files changed

+30
-120
lines changed

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

+5-20
Original file line numberDiff line numberDiff line change
@@ -1020,10 +1020,7 @@ public override async Task Null_propagation_optimization5(bool async)
10201020
"""
10211021
SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOfBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank]
10221022
FROM [Gears] AS [g]
1023-
WHERE CASE
1024-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1025-
ELSE NULL
1026-
END = 5
1023+
WHERE CAST(LEN([g].[LeaderNickname]) AS int) = 5
10271024
""");
10281025
}
10291026

@@ -1036,10 +1033,7 @@ public override async Task Null_propagation_optimization6(bool async)
10361033
"""
10371034
SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOfBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank]
10381035
FROM [Gears] AS [g]
1039-
WHERE CASE
1040-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1041-
ELSE NULL
1042-
END = 5
1036+
WHERE CAST(LEN([g].[LeaderNickname]) AS int) = 5
10431037
""");
10441038
}
10451039

@@ -1050,10 +1044,7 @@ public override async Task Select_null_propagation_optimization7(bool async)
10501044
// issue #16050
10511045
AssertSql(
10521046
"""
1053-
SELECT CASE
1054-
WHEN [g].[LeaderNickname] IS NOT NULL THEN [g].[LeaderNickname] + [g].[LeaderNickname]
1055-
ELSE NULL
1056-
END
1047+
SELECT [g].[LeaderNickname] + [g].[LeaderNickname]
10571048
FROM [Gears] AS [g]
10581049
""");
10591050
}
@@ -1243,10 +1234,7 @@ public override async Task Select_null_propagation_works_for_multiple_navigation
12431234

12441235
AssertSql(
12451236
"""
1246-
SELECT CASE
1247-
WHEN [c].[Name] IS NOT NULL THEN [c].[Name]
1248-
ELSE NULL
1249-
END
1237+
SELECT [c].[Name]
12501238
FROM [Tags] AS [t]
12511239
LEFT JOIN [Gears] AS [g] ON [t].[GearNickName] = [g].[Nickname] AND [t].[GearSquadId] = [g].[SquadId]
12521240
LEFT JOIN [Tags] AS [t0] ON ([g].[Nickname] = [t0].[GearNickName] OR ([g].[Nickname] IS NULL AND [t0].[GearNickName] IS NULL)) AND ([g].[SquadId] = [t0].[GearSquadId] OR ([g].[SquadId] IS NULL AND [t0].[GearSquadId] IS NULL))
@@ -3658,10 +3646,7 @@ public override async Task Select_null_conditional_with_inheritance(bool async)
36583646

36593647
AssertSql(
36603648
"""
3661-
SELECT CASE
3662-
WHEN [f].[CommanderName] IS NOT NULL THEN [f].[CommanderName]
3663-
ELSE NULL
3664-
END
3649+
SELECT [f].[CommanderName]
36653650
FROM [Factions] AS [f]
36663651
""");
36673652
}

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

+5-20
Original file line numberDiff line numberDiff line change
@@ -4507,10 +4507,7 @@ public override async Task Is_not_null_optimizes_unary_op(bool async)
45074507

45084508
AssertSql(
45094509
"""
4510-
SELECT CASE
4511-
WHEN [e].[NullableIntA] IS NOT NULL THEN ~[e].[NullableIntA]
4512-
ELSE NULL
4513-
END
4510+
SELECT ~[e].[NullableIntA]
45144511
FROM [Entities1] AS [e]
45154512
""");
45164513
}
@@ -4521,10 +4518,7 @@ public override async Task Is_not_null_optimizes_binary_op(bool async)
45214518

45224519
AssertSql(
45234520
"""
4524-
SELECT CASE
4525-
WHEN [e].[NullableIntA] IS NOT NULL AND [e].[NullableIntB] IS NOT NULL THEN [e].[NullableIntA] + [e].[NullableIntB]
4526-
ELSE NULL
4527-
END
4521+
SELECT [e].[NullableIntA] + [e].[NullableIntB]
45284522
FROM [Entities1] AS [e]
45294523
""");
45304524
}
@@ -4535,10 +4529,7 @@ public override async Task Is_not_null_optimizes_binary_op_with_partial_checks(b
45354529

45364530
AssertSql(
45374531
"""
4538-
SELECT CASE
4539-
WHEN [e].[NullableStringA] IS NOT NULL AND [e].[NullableStringB] IS NOT NULL THEN [e].[NullableStringA] + [e].[NullableStringB] + COALESCE([e].[NullableStringC], N'')
4540-
ELSE NULL
4541-
END
4532+
SELECT [e].[NullableStringA] + [e].[NullableStringB] + COALESCE([e].[NullableStringC], N'')
45424533
FROM [Entities1] AS [e]
45434534
""");
45444535
}
@@ -4549,13 +4540,7 @@ public override async Task Is_not_null_optimizes_binary_op_with_nested_checks(bo
45494540

45504541
AssertSql(
45514542
"""
4552-
SELECT CASE
4553-
WHEN [e].[NullableStringA] IS NOT NULL THEN CASE
4554-
WHEN [e].[NullableStringB] IS NOT NULL THEN [e].[NullableStringA] + [e].[NullableStringB]
4555-
ELSE NULL
4556-
END
4557-
ELSE NULL
4558-
END
4543+
SELECT [e].[NullableStringA] + [e].[NullableStringB]
45594544
FROM [Entities1] AS [e]
45604545
""");
45614546
}
@@ -4567,7 +4552,7 @@ public override async Task Is_not_null_optimizes_binary_op_with_mixed_checks(boo
45674552
AssertSql(
45684553
"""
45694554
SELECT CASE
4570-
WHEN [e].[NullableStringA] IS NOT NULL AND [e].[BoolA] = CAST(1 AS bit) THEN [e].[NullableStringA] + COALESCE([e].[NullableStringB], N'')
4555+
WHEN [e].[BoolA] = CAST(1 AS bit) THEN [e].[NullableStringA] + COALESCE([e].[NullableStringB], N'')
45714556
ELSE NULL
45724557
END
45734558
FROM [Entities1] AS [e]

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

+5-20
Original file line numberDiff line numberDiff line change
@@ -1418,10 +1418,7 @@ UNION ALL
14181418
SELECT [o].[Nickname], [o].[SquadId], [o].[AssignedCityName], [o].[CityOfBirthName], [o].[FullName], [o].[HasSoulPatch], [o].[LeaderNickname], [o].[LeaderSquadId], [o].[Rank], N'Officer' AS [Discriminator]
14191419
FROM [Officers] AS [o]
14201420
) AS [u]
1421-
WHERE CASE
1422-
WHEN [u].[LeaderNickname] IS NOT NULL THEN CAST(LEN([u].[LeaderNickname]) AS int)
1423-
ELSE NULL
1424-
END = 5
1421+
WHERE CAST(LEN([u].[LeaderNickname]) AS int) = 5
14251422
""");
14261423
}
14271424

@@ -1440,10 +1437,7 @@ UNION ALL
14401437
SELECT [o].[Nickname], [o].[SquadId], [o].[AssignedCityName], [o].[CityOfBirthName], [o].[FullName], [o].[HasSoulPatch], [o].[LeaderNickname], [o].[LeaderSquadId], [o].[Rank], N'Officer' AS [Discriminator]
14411438
FROM [Officers] AS [o]
14421439
) AS [u]
1443-
WHERE CASE
1444-
WHEN [u].[LeaderNickname] IS NOT NULL THEN CAST(LEN([u].[LeaderNickname]) AS int)
1445-
ELSE NULL
1446-
END = 5
1440+
WHERE CAST(LEN([u].[LeaderNickname]) AS int) = 5
14471441
""");
14481442
}
14491443

@@ -1454,10 +1448,7 @@ public override async Task Select_null_propagation_optimization7(bool async)
14541448
// issue #16050
14551449
AssertSql(
14561450
"""
1457-
SELECT CASE
1458-
WHEN [u].[LeaderNickname] IS NOT NULL THEN [u].[LeaderNickname] + [u].[LeaderNickname]
1459-
ELSE NULL
1460-
END
1451+
SELECT [u].[LeaderNickname] + [u].[LeaderNickname]
14611452
FROM (
14621453
SELECT [g].[LeaderNickname]
14631454
FROM [Gears] AS [g]
@@ -1749,10 +1740,7 @@ public override async Task Select_null_propagation_works_for_multiple_navigation
17491740

17501741
AssertSql(
17511742
"""
1752-
SELECT CASE
1753-
WHEN [c].[Name] IS NOT NULL THEN [c].[Name]
1754-
ELSE NULL
1755-
END
1743+
SELECT [c].[Name]
17561744
FROM [Tags] AS [t]
17571745
LEFT JOIN (
17581746
SELECT [g].[Nickname], [g].[SquadId]
@@ -4871,10 +4859,7 @@ public override async Task Select_null_conditional_with_inheritance(bool async)
48714859

48724860
AssertSql(
48734861
"""
4874-
SELECT CASE
4875-
WHEN [l].[CommanderName] IS NOT NULL THEN [l].[CommanderName]
4876-
ELSE NULL
4877-
END
4862+
SELECT [l].[CommanderName]
48784863
FROM [LocustHordes] AS [l]
48794864
""");
48804865
}

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

+5-20
Original file line numberDiff line numberDiff line change
@@ -1236,10 +1236,7 @@ WHEN [o].[Nickname] IS NOT NULL THEN N'Officer'
12361236
END AS [Discriminator]
12371237
FROM [Gears] AS [g]
12381238
LEFT JOIN [Officers] AS [o] ON [g].[Nickname] = [o].[Nickname] AND [g].[SquadId] = [o].[SquadId]
1239-
WHERE CASE
1240-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1241-
ELSE NULL
1242-
END = 5
1239+
WHERE CAST(LEN([g].[LeaderNickname]) AS int) = 5
12431240
""");
12441241
}
12451242

@@ -1255,10 +1252,7 @@ WHEN [o].[Nickname] IS NOT NULL THEN N'Officer'
12551252
END AS [Discriminator]
12561253
FROM [Gears] AS [g]
12571254
LEFT JOIN [Officers] AS [o] ON [g].[Nickname] = [o].[Nickname] AND [g].[SquadId] = [o].[SquadId]
1258-
WHERE CASE
1259-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1260-
ELSE NULL
1261-
END = 5
1255+
WHERE CAST(LEN([g].[LeaderNickname]) AS int) = 5
12621256
""");
12631257
}
12641258

@@ -1269,10 +1263,7 @@ public override async Task Select_null_propagation_optimization7(bool async)
12691263
// issue #16050
12701264
AssertSql(
12711265
"""
1272-
SELECT CASE
1273-
WHEN [g].[LeaderNickname] IS NOT NULL THEN [g].[LeaderNickname] + [g].[LeaderNickname]
1274-
ELSE NULL
1275-
END
1266+
SELECT [g].[LeaderNickname] + [g].[LeaderNickname]
12761267
FROM [Gears] AS [g]
12771268
""");
12781269
}
@@ -1480,10 +1471,7 @@ public override async Task Select_null_propagation_works_for_multiple_navigation
14801471

14811472
AssertSql(
14821473
"""
1483-
SELECT CASE
1484-
WHEN [c].[Name] IS NOT NULL THEN [c].[Name]
1485-
ELSE NULL
1486-
END
1474+
SELECT [c].[Name]
14871475
FROM [Tags] AS [t]
14881476
LEFT JOIN (
14891477
SELECT [g].[Nickname], [g].[SquadId]
@@ -4163,10 +4151,7 @@ public override async Task Select_null_conditional_with_inheritance(bool async)
41634151

41644152
AssertSql(
41654153
"""
4166-
SELECT CASE
4167-
WHEN [l].[CommanderName] IS NOT NULL THEN [l].[CommanderName]
4168-
ELSE NULL
4169-
END
4154+
SELECT [l].[CommanderName]
41704155
FROM [Factions] AS [f]
41714156
LEFT JOIN [LocustHordes] AS [l] ON [f].[Id] = [l].[Id]
41724157
WHERE [l].[Id] IS NOT NULL

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

+5-20
Original file line numberDiff line numberDiff line change
@@ -1602,10 +1602,7 @@ public override async Task Null_propagation_optimization6(bool async)
16021602
"""
16031603
SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOfBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[PeriodEnd], [g].[PeriodStart], [g].[Rank]
16041604
FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g]
1605-
WHERE CASE
1606-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1607-
ELSE NULL
1608-
END = 5
1605+
WHERE CAST(LEN([g].[LeaderNickname]) AS int) = 5
16091606
""");
16101607
}
16111608

@@ -4038,10 +4035,7 @@ public override async Task Null_propagation_optimization5(bool async)
40384035
"""
40394036
SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOfBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[PeriodEnd], [g].[PeriodStart], [g].[Rank]
40404037
FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g]
4041-
WHERE CASE
4042-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
4043-
ELSE NULL
4044-
END = 5
4038+
WHERE CAST(LEN([g].[LeaderNickname]) AS int) = 5
40454039
""");
40464040
}
40474041

@@ -5173,10 +5167,7 @@ public override async Task Select_null_propagation_optimization7(bool async)
51735167

51745168
AssertSql(
51755169
"""
5176-
SELECT CASE
5177-
WHEN [g].[LeaderNickname] IS NOT NULL THEN [g].[LeaderNickname] + [g].[LeaderNickname]
5178-
ELSE NULL
5179-
END
5170+
SELECT [g].[LeaderNickname] + [g].[LeaderNickname]
51805171
FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g]
51815172
""");
51825173
}
@@ -5840,10 +5831,7 @@ public override async Task Select_null_propagation_works_for_multiple_navigation
58405831

58415832
AssertSql(
58425833
"""
5843-
SELECT CASE
5844-
WHEN [c].[Name] IS NOT NULL THEN [c].[Name]
5845-
ELSE NULL
5846-
END
5834+
SELECT [c].[Name]
58475835
FROM [Tags] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [t]
58485836
LEFT JOIN [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g] ON [t].[GearNickName] = [g].[Nickname] AND [t].[GearSquadId] = [g].[SquadId]
58495837
LEFT JOIN [Tags] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [t0] ON ([g].[Nickname] = [t0].[GearNickName] OR ([g].[Nickname] IS NULL AND [t0].[GearNickName] IS NULL)) AND ([g].[SquadId] = [t0].[GearSquadId] OR ([g].[SquadId] IS NULL AND [t0].[GearSquadId] IS NULL))
@@ -7883,10 +7871,7 @@ public override async Task Select_null_conditional_with_inheritance(bool async)
78837871

78847872
AssertSql(
78857873
"""
7886-
SELECT CASE
7887-
WHEN [f].[CommanderName] IS NOT NULL THEN [f].[CommanderName]
7888-
ELSE NULL
7889-
END
7874+
SELECT [f].[CommanderName]
78907875
FROM [Factions] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [f]
78917876
""");
78927877
}

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

+5-20
Original file line numberDiff line numberDiff line change
@@ -1063,10 +1063,7 @@ public override async Task Null_propagation_optimization6(bool async)
10631063
"""
10641064
SELECT "g"."Nickname", "g"."SquadId", "g"."AssignedCityName", "g"."CityOfBirthName", "g"."Discriminator", "g"."FullName", "g"."HasSoulPatch", "g"."LeaderNickname", "g"."LeaderSquadId", "g"."Rank"
10651065
FROM "Gears" AS "g"
1066-
WHERE CASE
1067-
WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."LeaderNickname")
1068-
ELSE NULL
1069-
END = 5
1066+
WHERE length("g"."LeaderNickname") = 5
10701067
""");
10711068
}
10721069

@@ -3203,10 +3200,7 @@ public override async Task Select_null_propagation_works_for_multiple_navigation
32033200

32043201
AssertSql(
32053202
"""
3206-
SELECT CASE
3207-
WHEN "c"."Name" IS NOT NULL THEN "c"."Name"
3208-
ELSE NULL
3209-
END
3203+
SELECT "c"."Name"
32103204
FROM "Tags" AS "t"
32113205
LEFT JOIN "Gears" AS "g" ON "t"."GearNickName" = "g"."Nickname" AND "t"."GearSquadId" = "g"."SquadId"
32123206
LEFT JOIN "Tags" AS "t0" ON ("g"."Nickname" = "t0"."GearNickName" OR ("g"."Nickname" IS NULL AND "t0"."GearNickName" IS NULL)) AND ("g"."SquadId" = "t0"."GearSquadId" OR ("g"."SquadId" IS NULL AND "t0"."GearSquadId" IS NULL))
@@ -5818,10 +5812,7 @@ public override async Task Select_null_propagation_optimization7(bool async)
58185812

58195813
AssertSql(
58205814
"""
5821-
SELECT CASE
5822-
WHEN "g"."LeaderNickname" IS NOT NULL THEN "g"."LeaderNickname" || "g"."LeaderNickname"
5823-
ELSE NULL
5824-
END
5815+
SELECT "g"."LeaderNickname" || "g"."LeaderNickname"
58255816
FROM "Gears" AS "g"
58265817
""");
58275818
}
@@ -6469,10 +6460,7 @@ public override async Task Select_null_conditional_with_inheritance(bool async)
64696460

64706461
AssertSql(
64716462
"""
6472-
SELECT CASE
6473-
WHEN "f"."CommanderName" IS NOT NULL THEN "f"."CommanderName"
6474-
ELSE NULL
6475-
END
6463+
SELECT "f"."CommanderName"
64766464
FROM "Factions" AS "f"
64776465
""");
64786466
}
@@ -7550,10 +7538,7 @@ public override async Task Null_propagation_optimization5(bool async)
75507538
"""
75517539
SELECT "g"."Nickname", "g"."SquadId", "g"."AssignedCityName", "g"."CityOfBirthName", "g"."Discriminator", "g"."FullName", "g"."HasSoulPatch", "g"."LeaderNickname", "g"."LeaderSquadId", "g"."Rank"
75527540
FROM "Gears" AS "g"
7553-
WHERE CASE
7554-
WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."LeaderNickname")
7555-
ELSE NULL
7556-
END = 5
7541+
WHERE length("g"."LeaderNickname") = 5
75577542
""");
75587543
}
75597544

0 commit comments

Comments
 (0)