Skip to content

Commit 30d6b9b

Browse files
Copilotrenemadsen
andcommitted
Convert 4 obsolete test overrides: SqlQuery and BulkUpdates methods
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent 4d77bf0 commit 30d6b9b

File tree

2 files changed

+39
-9
lines changed

2 files changed

+39
-9
lines changed

test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,20 @@ LIMIT @__p_1 OFFSET @__p_0
530530
""");
531531
}
532532

533-
public override async Task Delete_with_left_join(bool async)
533+
[ConditionalTheory]
534+
[MemberData(nameof(IsAsyncData))]
535+
public virtual async Task Delete_with_left_join(bool async)
534536
{
535-
await base.Delete_with_left_join(async);
537+
await AssertDelete(
538+
async,
539+
ss => ss.Set<OrderDetail>().Where(
540+
od => ss.Set<Order>()
541+
.Where(o => o.OrderID < 10300)
542+
.OrderBy(o => o.OrderID)
543+
.Skip(0)
544+
.Take(100)
545+
.Select(o => o.OrderID)
546+
.Contains(od.OrderID)));
536547

537548
AssertSql(
538549
"""
@@ -1086,9 +1097,15 @@ public override async Task Update_without_property_to_set_throws(bool async)
10861097
AssertExecuteUpdateSql();
10871098
}
10881099

1089-
public override async Task Update_with_invalid_lambda_throws(bool async)
1100+
[ConditionalTheory]
1101+
[MemberData(nameof(IsAsyncData))]
1102+
public virtual async Task Update_with_invalid_lambda_throws(bool async)
10901103
{
1091-
await base.Update_with_invalid_lambda_throws(async);
1104+
await AssertTranslationFailed(
1105+
() => AssertUpdate(
1106+
async,
1107+
ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
1108+
_ => new Customer { City = "invalidValue" }));
10921109

10931110
AssertExecuteUpdateSql();
10941111
}
@@ -1219,9 +1236,14 @@ INNER JOIN (
12191236
""");
12201237
}
12211238

1222-
public override async Task Update_with_left_join_set_constant(bool async)
1239+
[ConditionalTheory]
1240+
[MemberData(nameof(IsAsyncData))]
1241+
public virtual async Task Update_with_left_join_set_constant(bool async)
12231242
{
1224-
await base.Update_with_left_join_set_constant(async);
1243+
await AssertUpdate(
1244+
async,
1245+
ss => ss.Set<Customer>().Where(c => c.CustomerID.StartsWith("F")),
1246+
e => e.SetProperty(p => p.ContactName, "Updated"));
12251247

12261248
AssertExecuteUpdateSql(
12271249
"""

test/EFCore.MySql.FunctionalTests/Query/SqlQueryMySqlTest.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,17 @@ public override async Task SqlQueryRaw_with_dbParameter_mixed_in_subquery(bool a
675675
""");
676676
}
677677

678-
public override async Task Multiple_occurrences_of_SqlQuery_with_db_parameter_adds_parameter_only_once(bool async)
679-
{
680-
await base.Multiple_occurrences_of_SqlQuery_with_db_parameter_adds_parameter_only_once(async);
678+
[ConditionalTheory]
679+
[MemberData(nameof(IsAsyncData))]
680+
public virtual async Task Multiple_occurrences_of_SqlQuery_with_db_parameter_adds_parameter_only_once(bool async)
681+
{
682+
await AssertQuery(
683+
async,
684+
ss => ss.Set<Customer>()
685+
.FromSql($"SELECT * FROM `Customers` WHERE `City` = {"Seattle"}")
686+
.Intersect(
687+
ss.Set<Customer>()
688+
.FromSql($"SELECT * FROM `Customers` WHERE `City` = {"Seattle"}")));
681689

682690
AssertSql(
683691
"""

0 commit comments

Comments
 (0)