Skip to content

Commit 262a43d

Browse files
Copilotrenemadsen
andcommitted
Fix Include_duplicate_collection_result_operator param naming, Tpc_Sprocs lambda syntax, and Update_with_PK_pushdown subquery aliases
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent 6b8c54d commit 262a43d

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,11 +1772,11 @@ public override async Task Update_with_PK_pushdown_and_join_and_multiple_setters
17721772
17731773
UPDATE `Order Details` AS `o2`
17741774
INNER JOIN (
1775-
SELECT `o2`.`OrderID`, `o2`.`ProductID`
1776-
FROM `Orders` AS `o1`
1777-
INNER JOIN `Order Details` AS `o2` ON `o1`.`OrderID` = `o2`.`OrderID`
1778-
WHERE `o1`.`OrderID` < @p
1779-
) AS `o` ON `o2`.`OrderID` = `o`.`OrderID` AND `o2`.`ProductID` = `o`.`ProductID`
1775+
SELECT `o1`.`OrderID`, `o1`.`ProductID`
1776+
FROM `Orders` AS `o`
1777+
INNER JOIN `Order Details` AS `o1` ON `o`.`OrderID` = `o1`.`OrderID`
1778+
WHERE `o`.`OrderID` < @p
1779+
) AS `o0` ON `o2`.`OrderID` = `o0`.`OrderID` AND `o2`.`ProductID` = `o0`.`ProductID`
17801780
SET `o2`.`Quantity` = CAST(@p2 AS signed),
17811781
`o2`.`UnitPrice` = `o2`.`UnitPrice`
17821782
""");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ from c2 in ss.Set<Customer>().Include(c => c.Orders).OrderBy(c => c.CustomerID).
15961596
AssertSql(
15971597
"""
15981598
@p='2'
1599-
@p1='1'
1599+
@p2='1'
16001600
16011601
SELECT `s`.`CustomerID`, `s`.`Address`, `s`.`City`, `s`.`CompanyName`, `s`.`ContactName`, `s`.`ContactTitle`, `s`.`Country`, `s`.`Fax`, `s`.`Phone`, `s`.`PostalCode`, `s`.`Region`, `s`.`CustomerID0`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `s`.`Address0`, `s`.`City0`, `s`.`CompanyName0`, `s`.`ContactName0`, `s`.`ContactTitle0`, `s`.`Country0`, `s`.`Fax0`, `s`.`Phone0`, `s`.`PostalCode0`, `s`.`Region0`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
16021602
FROM (

test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc_Sprocs/PrincipalBaseEntityType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
255255
storeGenerationIndex: -1);
256256
flagsEnum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
257257
comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
258-
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2))),
258+
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
259259
int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
260260
CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
261261
keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
262-
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2))),
262+
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)),
263263
int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
264264
CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
265265
providerValueComparer: new ValueComparer<int>(

0 commit comments

Comments
 (0)