Skip to content

Commit fee118c

Browse files
ChrisJollyAUChrisJollyAU
committed
missed some tests for ODBC fix
1 parent f4a9e70 commit fee118c

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎test/EFCore.Jet.FunctionalTests/FindJetTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ public override void Returns_null_for_int_key_not_in_store()
8282
base.Returns_null_for_int_key_not_in_store();
8383

8484
AssertSql(
85-
"""
85+
$"""
8686
@__p_0='99'
8787
8888
SELECT `i3`.`Id`, `i3`.`Foo`, `s`.`IntKeyId`, `s`.`Id`, `s`.`Prop`, `s`.`NestedOwned_Prop`, `s`.`Owned1IntKeyId`, `s`.`Owned1Id`, `s`.`Id0`, `s`.`Prop0`, `i3`.`OwnedReference_Prop`, `i3`.`OwnedReference_NestedOwned_Prop`, `i2`.`Owned1IntKeyId`, `i2`.`Id`, `i2`.`Prop`
8989
FROM ((
9090
SELECT TOP 1 `i`.`Id`, `i`.`Foo`, `i`.`OwnedReference_Prop`, `i`.`OwnedReference_NestedOwned_Prop`
9191
FROM `IntKey` AS `i`
92-
WHERE `i`.`Id` = @__p_0
92+
WHERE `i`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}
9393
) AS `i3`
9494
LEFT JOIN (
9595
SELECT `i0`.`IntKeyId`, `i0`.`Id`, `i0`.`Prop`, `i0`.`NestedOwned_Prop`, `i1`.`Owned1IntKeyId`, `i1`.`Owned1Id`, `i1`.`Id` AS `Id0`, `i1`.`Prop` AS `Prop0`

‎test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTestBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ public async Task Insert_explicit_value_throws_when_readonly_before_save()
13161316
{
13171317
Id = IntSentinel,
13181318
Name = "Two Unicorns",
1319-
CreatedOn = new DateTime(1969, 8, 3, 0, 10, 0)
1319+
CreatedOn = new DateTime(1973, 8, 3, 0, 10, 0)
13201320
});
13211321

13221322
// The property 'CreatedOn' on entity type 'Blog' is defined to be read-only before it is

‎test/EFCore.Jet.FunctionalTests/Query/ComplexNavigationsQueryJetTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4367,15 +4367,15 @@ public override async Task GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_us
43674367
await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure(async);
43684368

43694369
AssertSql(
4370-
"""
4370+
$"""
43714371
@__prm_0='10'
43724372
43734373
SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2`
43744374
FROM `LevelOne` AS `l`
43754375
LEFT JOIN (
43764376
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
43774377
FROM `LevelTwo` AS `l0`
4378-
WHERE `l0`.`Id` <> @__prm_0
4378+
WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm_0")}
43794379
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
43804380
""");
43814381
}
@@ -4385,15 +4385,15 @@ public override async Task GroupJoin_SelectMany_with_predicate_using_closure(boo
43854385
await base.GroupJoin_SelectMany_with_predicate_using_closure(async);
43864386

43874387
AssertSql(
4388-
"""
4388+
$"""
43894389
@__prm_0='10'
43904390
43914391
SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2`
43924392
FROM `LevelOne` AS `l`
43934393
INNER JOIN (
43944394
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
43954395
FROM `LevelTwo` AS `l0`
4396-
WHERE `l0`.`Id` <> @__prm_0
4396+
WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm_0")}
43974397
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
43984398
""");
43994399
}
@@ -4403,7 +4403,7 @@ public override async Task GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_us
44034403
await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure_nested(async);
44044404

44054405
AssertSql(
4406-
"""
4406+
$"""
44074407
@__prm1_0='10'
44084408
@__prm2_1='20'
44094409
@@ -4412,12 +4412,12 @@ public override async Task GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_us
44124412
LEFT JOIN (
44134413
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
44144414
FROM `LevelTwo` AS `l0`
4415-
WHERE `l0`.`Id` <> @__prm1_0
4415+
WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm1_0")}
44164416
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`)
44174417
LEFT JOIN (
44184418
SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`
44194419
FROM `LevelThree` AS `l2`
4420-
WHERE `l2`.`Id` <> @__prm2_1
4420+
WHERE `l2`.`Id` <> {AssertSqlHelper.Parameter("@__prm2_1")}
44214421
) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id`
44224422
""");
44234423
}
@@ -4427,7 +4427,7 @@ public override async Task GroupJoin_SelectMany_with_predicate_using_closure_nes
44274427
await base.GroupJoin_SelectMany_with_predicate_using_closure_nested(async);
44284428

44294429
AssertSql(
4430-
"""
4430+
$"""
44314431
@__prm1_0='10'
44324432
@__prm2_1='20'
44334433
@@ -4436,12 +4436,12 @@ public override async Task GroupJoin_SelectMany_with_predicate_using_closure_nes
44364436
INNER JOIN (
44374437
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
44384438
FROM `LevelTwo` AS `l0`
4439-
WHERE `l0`.`Id` <> @__prm1_0
4439+
WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm1_0")}
44404440
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`)
44414441
LEFT JOIN (
44424442
SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`
44434443
FROM `LevelThree` AS `l2`
4444-
WHERE `l2`.`Id` <> @__prm2_1
4444+
WHERE `l2`.`Id` <> {AssertSqlHelper.Parameter("@__prm2_1")}
44454445
) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id`
44464446
WHERE `l1`.`Id` IS NOT NULL AND `l3`.`Level2_Optional_Id` IS NOT NULL
44474447
""");

‎test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,15 +607,15 @@ public override async Task Struct_complex_type_equals_parameter(bool async)
607607
await base.Struct_complex_type_equals_parameter(async);
608608

609609
AssertSql(
610-
"""
610+
$"""
611611
@__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255)
612612
@__entity_equality_address_0_ZipCode='38654' (Nullable = true)
613613
@__entity_equality_address_0_Country_Code='US' (Size = 255)
614614
@__entity_equality_address_0_Country_FullName='United States' (Size = 255)
615615
616616
SELECT `v`.`Id`, `v`.`Name`, `v`.`BillingAddress_AddressLine1`, `v`.`BillingAddress_AddressLine2`, `v`.`BillingAddress_ZipCode`, `v`.`BillingAddress_Country_Code`, `v`.`BillingAddress_Country_FullName`, `v`.`ShippingAddress_AddressLine1`, `v`.`ShippingAddress_AddressLine2`, `v`.`ShippingAddress_ZipCode`, `v`.`ShippingAddress_Country_Code`, `v`.`ShippingAddress_Country_FullName`
617617
FROM `ValuedCustomer` AS `v`
618-
WHERE `v`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1 AND `v`.`ShippingAddress_AddressLine2` IS NULL AND `v`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode AND `v`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Country_Code AND `v`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_Country_FullName
618+
WHERE `v`.`ShippingAddress_AddressLine1` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_AddressLine1")} AND `v`.`ShippingAddress_AddressLine2` IS NULL AND `v`.`ShippingAddress_ZipCode` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_ZipCode")} AND `v`.`ShippingAddress_Country_Code` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_Code")} AND `v`.`ShippingAddress_Country_FullName` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_FullName")}
619619
""");
620620
}
621621

@@ -631,7 +631,7 @@ public override async Task Contains_over_struct_complex_type(bool async)
631631
await base.Contains_over_struct_complex_type(async);
632632

633633
AssertSql(
634-
"""
634+
$"""
635635
@__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255)
636636
@__entity_equality_address_0_ZipCode='38654' (Nullable = true)
637637
@__entity_equality_address_0_Country_Code='US' (Size = 255)
@@ -642,7 +642,7 @@ public override async Task Contains_over_struct_complex_type(bool async)
642642
WHERE EXISTS (
643643
SELECT 1
644644
FROM `ValuedCustomer` AS `v0`
645-
WHERE `v0`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1 AND `v0`.`ShippingAddress_AddressLine2` IS NULL AND `v0`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode AND `v0`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Country_Code AND `v0`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_Country_FullName)
645+
WHERE `v0`.`ShippingAddress_AddressLine1` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_AddressLine1")} AND `v0`.`ShippingAddress_AddressLine2` IS NULL AND `v0`.`ShippingAddress_ZipCode` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_ZipCode")} AND `v0`.`ShippingAddress_Country_Code` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_Code")} AND `v0`.`ShippingAddress_Country_FullName` = {AssertSqlHelper.Parameter("@__entity_equality_address_0_Country_FullName")})
646646
""");
647647
}
648648

‎test/EFCore.Jet.FunctionalTests/TPTTableSplittingJetTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public override async Task Can_change_dependent_instance_non_derived()
165165
@p0='repairman' (Size = 255)
166166
@p1='Trek Pro Fit Madone 6 Series' (Nullable = false) (Size = 255)
167167
168-
UPDATE `Vehicles` SET `Operator_Name` = @p0
168+
UPDATE `Vehicles` SET `Operator_Name` = {AssertSqlHelper.Parameter("@p0")}
169169
WHERE `Name` = {AssertSqlHelper.Parameter("@p1")};
170170
SELECT @@ROWCOUNT;
171171
""",

0 commit comments

Comments
 (0)