Skip to content

Commit ece4eb0

Browse files
ranma42ranma42
committed
Update tests
1 parent ea289f4 commit ece4eb0

File tree

7 files changed

+25
-76
lines changed

7 files changed

+25
-76
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,10 +4107,7 @@ INNER JOIN (
41074107
FROM [LevelTwo] AS [l0]
41084108
) AS [l1]
41094109
GROUP BY [l1].[Key]
4110-
) AS [l2] ON [l].[Id] = [l2].[Key] AND CAST(1 AS bit) = CASE
4111-
WHEN [l2].[Sum] > 10 THEN CAST(1 AS bit)
4112-
ELSE CAST(0 AS bit)
4113-
END
4110+
) AS [l2] ON [l].[Id] = [l2].[Key] AND [l2].[Sum] > 10
41144111
""");
41154112
}
41164113

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,10 +920,7 @@ WHEN [l2].[OneToOne_Required_PK_Date] IS NOT NULL AND [l2].[Level1_Required_Id]
920920
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
921921
) AS [s]
922922
GROUP BY [s].[Key]
923-
) AS [s1] ON [l].[Id] = [s1].[Key] AND CAST(1 AS bit) = CASE
924-
WHEN [s1].[Sum] > 10 THEN CAST(1 AS bit)
925-
ELSE CAST(0 AS bit)
926-
END
923+
) AS [s1] ON [l].[Id] = [s1].[Key] AND [s1].[Sum] > 10
927924
""");
928925
}
929926

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ public override async Task Null_propagation_optimization1(bool async)
945945
"""
946946
SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOfBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank]
947947
FROM [Gears] AS [g]
948-
WHERE [g].[LeaderNickname] = N'Marcus' AND [g].[LeaderNickname] IS NOT NULL
948+
WHERE [g].[LeaderNickname] = N'Marcus'
949949
""");
950950
}
951951

@@ -999,10 +999,7 @@ FROM [Gears] AS [g]
999999
WHERE CASE
10001000
WHEN [g].[LeaderNickname] IS NULL THEN NULL
10011001
ELSE CAST(LEN([g].[LeaderNickname]) AS int)
1002-
END = 5 AND CASE
1003-
WHEN [g].[LeaderNickname] IS NULL THEN NULL
1004-
ELSE CAST(LEN([g].[LeaderNickname]) AS int)
1005-
END IS NOT NULL
1002+
END = 5
10061003
""");
10071004
}
10081005

@@ -1018,10 +1015,7 @@ FROM [Gears] AS [g]
10181015
WHERE CASE
10191016
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
10201017
ELSE NULL
1021-
END = 5 AND CASE
1022-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1023-
ELSE NULL
1024-
END IS NOT NULL
1018+
END = 5
10251019
""");
10261020
}
10271021

@@ -1037,10 +1031,7 @@ FROM [Gears] AS [g]
10371031
WHERE CASE
10381032
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
10391033
ELSE NULL
1040-
END = 5 AND CASE
1041-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1042-
ELSE NULL
1043-
END IS NOT NULL
1034+
END = 5
10441035
""");
10451036
}
10461037

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ UNION ALL
13191319
SELECT [o].[Nickname], [o].[SquadId], [o].[AssignedCityName], [o].[CityOfBirthName], [o].[FullName], [o].[HasSoulPatch], [o].[LeaderNickname], [o].[LeaderSquadId], [o].[Rank], N'Officer' AS [Discriminator]
13201320
FROM [Officers] AS [o]
13211321
) AS [u]
1322-
WHERE [u].[LeaderNickname] = N'Marcus' AND [u].[LeaderNickname] IS NOT NULL
1322+
WHERE [u].[LeaderNickname] = N'Marcus'
13231323
""");
13241324
}
13251325

@@ -1391,10 +1391,7 @@ FROM [Officers] AS [o]
13911391
WHERE CASE
13921392
WHEN [u].[LeaderNickname] IS NULL THEN NULL
13931393
ELSE CAST(LEN([u].[LeaderNickname]) AS int)
1394-
END = 5 AND CASE
1395-
WHEN [u].[LeaderNickname] IS NULL THEN NULL
1396-
ELSE CAST(LEN([u].[LeaderNickname]) AS int)
1397-
END IS NOT NULL
1394+
END = 5
13981395
""");
13991396
}
14001397

@@ -1416,10 +1413,7 @@ FROM [Officers] AS [o]
14161413
WHERE CASE
14171414
WHEN [u].[LeaderNickname] IS NOT NULL THEN CAST(LEN([u].[LeaderNickname]) AS int)
14181415
ELSE NULL
1419-
END = 5 AND CASE
1420-
WHEN [u].[LeaderNickname] IS NOT NULL THEN CAST(LEN([u].[LeaderNickname]) AS int)
1421-
ELSE NULL
1422-
END IS NOT NULL
1416+
END = 5
14231417
""");
14241418
}
14251419

@@ -1441,10 +1435,7 @@ FROM [Officers] AS [o]
14411435
WHERE CASE
14421436
WHEN [u].[LeaderNickname] IS NOT NULL THEN CAST(LEN([u].[LeaderNickname]) AS int)
14431437
ELSE NULL
1444-
END = 5 AND CASE
1445-
WHEN [u].[LeaderNickname] IS NOT NULL THEN CAST(LEN([u].[LeaderNickname]) AS int)
1446-
ELSE NULL
1447-
END IS NOT NULL
1438+
END = 5
14481439
""");
14491440
}
14501441

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ WHEN [o].[Nickname] IS NOT NULL THEN N'Officer'
11481148
END AS [Discriminator]
11491149
FROM [Gears] AS [g]
11501150
LEFT JOIN [Officers] AS [o] ON [g].[Nickname] = [o].[Nickname] AND [g].[SquadId] = [o].[SquadId]
1151-
WHERE [g].[LeaderNickname] = N'Marcus' AND [g].[LeaderNickname] IS NOT NULL
1151+
WHERE [g].[LeaderNickname] = N'Marcus'
11521152
""");
11531153
}
11541154

@@ -1211,10 +1211,7 @@ FROM [Gears] AS [g]
12111211
WHERE CASE
12121212
WHEN [g].[LeaderNickname] IS NULL THEN NULL
12131213
ELSE CAST(LEN([g].[LeaderNickname]) AS int)
1214-
END = 5 AND CASE
1215-
WHEN [g].[LeaderNickname] IS NULL THEN NULL
1216-
ELSE CAST(LEN([g].[LeaderNickname]) AS int)
1217-
END IS NOT NULL
1214+
END = 5
12181215
""");
12191216
}
12201217

@@ -1233,10 +1230,7 @@ FROM [Gears] AS [g]
12331230
WHERE CASE
12341231
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
12351232
ELSE NULL
1236-
END = 5 AND CASE
1237-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1238-
ELSE NULL
1239-
END IS NOT NULL
1233+
END = 5
12401234
""");
12411235
}
12421236

@@ -1255,10 +1249,7 @@ FROM [Gears] AS [g]
12551249
WHERE CASE
12561250
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
12571251
ELSE NULL
1258-
END = 5 AND CASE
1259-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1260-
ELSE NULL
1261-
END IS NOT NULL
1252+
END = 5
12621253
""");
12631254
}
12641255

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ public override async Task Null_propagation_optimization1(bool async)
11871187
"""
11881188
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]
11891189
FROM [Gears] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [g]
1190-
WHERE [g].[LeaderNickname] = N'Marcus' AND [g].[LeaderNickname] IS NOT NULL
1190+
WHERE [g].[LeaderNickname] = N'Marcus'
11911191
""");
11921192
}
11931193

@@ -1605,10 +1605,7 @@ public override async Task Null_propagation_optimization6(bool async)
16051605
WHERE CASE
16061606
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
16071607
ELSE NULL
1608-
END = 5 AND CASE
1609-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
1610-
ELSE NULL
1611-
END IS NOT NULL
1608+
END = 5
16121609
""");
16131610
}
16141611

@@ -4039,10 +4036,7 @@ public override async Task Null_propagation_optimization5(bool async)
40394036
WHERE CASE
40404037
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
40414038
ELSE NULL
4042-
END = 5 AND CASE
4043-
WHEN [g].[LeaderNickname] IS NOT NULL THEN CAST(LEN([g].[LeaderNickname]) AS int)
4044-
ELSE NULL
4045-
END IS NOT NULL
4039+
END = 5
40464040
""");
40474041
}
40484042

@@ -4971,10 +4965,7 @@ public override async Task Null_propagation_optimization4(bool async)
49714965
WHERE CASE
49724966
WHEN [g].[LeaderNickname] IS NULL THEN NULL
49734967
ELSE CAST(LEN([g].[LeaderNickname]) AS int)
4974-
END = 5 AND CASE
4975-
WHEN [g].[LeaderNickname] IS NULL THEN NULL
4976-
ELSE CAST(LEN([g].[LeaderNickname]) AS int)
4977-
END IS NOT NULL
4968+
END = 5
49784969
""");
49794970
}
49804971

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,10 +1066,7 @@ public override async Task Null_propagation_optimization6(bool async)
10661066
WHERE CASE
10671067
WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."LeaderNickname")
10681068
ELSE NULL
1069-
END = 5 AND CASE
1070-
WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."LeaderNickname")
1071-
ELSE NULL
1072-
END IS NOT NULL
1069+
END = 5
10731070
""");
10741071
}
10751072

@@ -1566,7 +1563,7 @@ public override async Task Null_propagation_optimization3(bool async)
15661563
WHERE CASE
15671564
WHEN "g"."LeaderNickname" IS NOT NULL THEN "g"."LeaderNickname" LIKE '%us'
15681565
ELSE NULL
1569-
END = 1
1566+
END
15701567
""");
15711568
}
15721569

@@ -3370,7 +3367,7 @@ public override async Task Null_propagation_optimization2(bool async)
33703367
WHERE CASE
33713368
WHEN "g"."LeaderNickname" IS NULL THEN NULL
33723369
ELSE "g"."LeaderNickname" LIKE '%us' AND "g"."LeaderNickname" IS NOT NULL
3373-
END = 1
3370+
END
33743371
""");
33753372
}
33763373

@@ -5996,7 +5993,7 @@ public override async Task ToString_boolean_property_nullable(bool async)
59965993
"""
59975994
SELECT CASE
59985995
WHEN "f"."Eradicated" = 0 THEN 'False'
5999-
WHEN "f"."Eradicated" = 1 THEN 'True'
5996+
WHEN "f"."Eradicated" THEN 'True'
60005997
ELSE NULL
60015998
END
60025999
FROM "Factions" AS "f"
@@ -7486,10 +7483,7 @@ public override async Task Null_propagation_optimization5(bool async)
74867483
WHERE CASE
74877484
WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."LeaderNickname")
74887485
ELSE NULL
7489-
END = 5 AND CASE
7490-
WHEN "g"."LeaderNickname" IS NOT NULL THEN length("g"."LeaderNickname")
7491-
ELSE NULL
7492-
END IS NOT NULL
7486+
END = 5
74937487
""");
74947488
}
74957489

@@ -8275,10 +8269,7 @@ public override async Task Null_propagation_optimization4(bool async)
82758269
WHERE CASE
82768270
WHEN "g"."LeaderNickname" IS NULL THEN NULL
82778271
ELSE length("g"."LeaderNickname")
8278-
END = 5 AND CASE
8279-
WHEN "g"."LeaderNickname" IS NULL THEN NULL
8280-
ELSE length("g"."LeaderNickname")
8281-
END IS NOT NULL
8272+
END = 5
82828273
""");
82838274
}
82848275

@@ -8481,7 +8472,7 @@ public override async Task Null_propagation_optimization1(bool async)
84818472
"""
84828473
SELECT "g"."Nickname", "g"."SquadId", "g"."AssignedCityName", "g"."CityOfBirthName", "g"."Discriminator", "g"."FullName", "g"."HasSoulPatch", "g"."LeaderNickname", "g"."LeaderSquadId", "g"."Rank"
84838474
FROM "Gears" AS "g"
8484-
WHERE "g"."LeaderNickname" = 'Marcus' AND "g"."LeaderNickname" IS NOT NULL
8475+
WHERE "g"."LeaderNickname" = 'Marcus'
84858476
""");
84868477
}
84878478

0 commit comments

Comments
 (0)