missed some tests for ODBC fix

pull/257/head
Christopher Jolly 1 year ago
parent f4a9e70e85
commit fee118c312

@ -82,14 +82,14 @@ ORDER BY `i3`.`Id`, `s`.`IntKeyId`, `s`.`Id`, `s`.`Owned1IntKeyId`, `s`.`Owned1I
base.Returns_null_for_int_key_not_in_store(); base.Returns_null_for_int_key_not_in_store();
AssertSql( AssertSql(
""" $"""
@__p_0='99' @__p_0='99'
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` 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`
FROM (( FROM ((
SELECT TOP 1 `i`.`Id`, `i`.`Foo`, `i`.`OwnedReference_Prop`, `i`.`OwnedReference_NestedOwned_Prop` SELECT TOP 1 `i`.`Id`, `i`.`Foo`, `i`.`OwnedReference_Prop`, `i`.`OwnedReference_NestedOwned_Prop`
FROM `IntKey` AS `i` FROM `IntKey` AS `i`
WHERE `i`.`Id` = @__p_0 WHERE `i`.`Id` = {AssertSqlHelper.Parameter("@__p_0")}
) AS `i3` ) AS `i3`
LEFT JOIN ( LEFT JOIN (
SELECT `i0`.`IntKeyId`, `i0`.`Id`, `i0`.`Prop`, `i0`.`NestedOwned_Prop`, `i1`.`Owned1IntKeyId`, `i1`.`Owned1Id`, `i1`.`Id` AS `Id0`, `i1`.`Prop` AS `Prop0` SELECT `i0`.`IntKeyId`, `i0`.`Id`, `i0`.`Prop`, `i0`.`NestedOwned_Prop`, `i1`.`Owned1IntKeyId`, `i1`.`Owned1Id`, `i1`.`Id` AS `Id0`, `i1`.`Prop` AS `Prop0`

@ -1316,7 +1316,7 @@ END");
{ {
Id = IntSentinel, Id = IntSentinel,
Name = "Two Unicorns", Name = "Two Unicorns",
CreatedOn = new DateTime(1969, 8, 3, 0, 10, 0) CreatedOn = new DateTime(1973, 8, 3, 0, 10, 0)
}); });
// The property 'CreatedOn' on entity type 'Blog' is defined to be read-only before it is // The property 'CreatedOn' on entity type 'Blog' is defined to be read-only before it is

@ -4367,7 +4367,7 @@ WHERE `l0`.`Id` IS NOT NULL AND `l1`.`OneToMany_Optional_Inverse3Id` IS NOT NULL
await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure(async); await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure(async);
AssertSql( AssertSql(
""" $"""
@__prm_0='10' @__prm_0='10'
SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2` SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2`
@ -4375,7 +4375,7 @@ FROM `LevelOne` AS `l`
LEFT JOIN ( LEFT JOIN (
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id` SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
FROM `LevelTwo` AS `l0` FROM `LevelTwo` AS `l0`
WHERE `l0`.`Id` <> @__prm_0 WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm_0")}
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id` ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
"""); """);
} }
@ -4385,7 +4385,7 @@ LEFT JOIN (
await base.GroupJoin_SelectMany_with_predicate_using_closure(async); await base.GroupJoin_SelectMany_with_predicate_using_closure(async);
AssertSql( AssertSql(
""" $"""
@__prm_0='10' @__prm_0='10'
SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2` SELECT `l`.`Id` AS `Id1`, `l1`.`Id` AS `Id2`
@ -4393,7 +4393,7 @@ FROM `LevelOne` AS `l`
INNER JOIN ( INNER JOIN (
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id` SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
FROM `LevelTwo` AS `l0` FROM `LevelTwo` AS `l0`
WHERE `l0`.`Id` <> @__prm_0 WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm_0")}
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id` ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
"""); """);
} }
@ -4403,7 +4403,7 @@ INNER JOIN (
await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure_nested(async); await base.GroupJoin_SelectMany_DefaultIfEmpty_with_predicate_using_closure_nested(async);
AssertSql( AssertSql(
""" $"""
@__prm1_0='10' @__prm1_0='10'
@__prm2_1='20' @__prm2_1='20'
@ -4412,12 +4412,12 @@ FROM (`LevelOne` AS `l`
LEFT JOIN ( LEFT JOIN (
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id` SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
FROM `LevelTwo` AS `l0` FROM `LevelTwo` AS `l0`
WHERE `l0`.`Id` <> @__prm1_0 WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm1_0")}
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`) ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`)
LEFT JOIN ( LEFT JOIN (
SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id` SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`
FROM `LevelThree` AS `l2` FROM `LevelThree` AS `l2`
WHERE `l2`.`Id` <> @__prm2_1 WHERE `l2`.`Id` <> {AssertSqlHelper.Parameter("@__prm2_1")}
) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id` ) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id`
"""); """);
} }
@ -4427,7 +4427,7 @@ LEFT JOIN (
await base.GroupJoin_SelectMany_with_predicate_using_closure_nested(async); await base.GroupJoin_SelectMany_with_predicate_using_closure_nested(async);
AssertSql( AssertSql(
""" $"""
@__prm1_0='10' @__prm1_0='10'
@__prm2_1='20' @__prm2_1='20'
@ -4436,12 +4436,12 @@ FROM (`LevelOne` AS `l`
INNER JOIN ( INNER JOIN (
SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id` SELECT `l0`.`Id`, `l0`.`Level1_Optional_Id`
FROM `LevelTwo` AS `l0` FROM `LevelTwo` AS `l0`
WHERE `l0`.`Id` <> @__prm1_0 WHERE `l0`.`Id` <> {AssertSqlHelper.Parameter("@__prm1_0")}
) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`) ) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`)
LEFT JOIN ( LEFT JOIN (
SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id` SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`
FROM `LevelThree` AS `l2` FROM `LevelThree` AS `l2`
WHERE `l2`.`Id` <> @__prm2_1 WHERE `l2`.`Id` <> {AssertSqlHelper.Parameter("@__prm2_1")}
) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id` ) AS `l3` ON `l1`.`Id` = `l3`.`Level2_Optional_Id`
WHERE `l1`.`Id` IS NOT NULL AND `l3`.`Level2_Optional_Id` IS NOT NULL WHERE `l1`.`Id` IS NOT NULL AND `l3`.`Level2_Optional_Id` IS NOT NULL
"""); """);

@ -607,7 +607,7 @@ WHERE `v`.`ShippingAddress_AddressLine1` = '804 S. Lakeshore Road' AND `v`.`Ship
await base.Struct_complex_type_equals_parameter(async); await base.Struct_complex_type_equals_parameter(async);
AssertSql( AssertSql(
""" $"""
@__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255) @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255)
@__entity_equality_address_0_ZipCode='38654' (Nullable = true) @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
@__entity_equality_address_0_Country_Code='US' (Size = 255) @__entity_equality_address_0_Country_Code='US' (Size = 255)
@ -615,7 +615,7 @@ WHERE `v`.`ShippingAddress_AddressLine1` = '804 S. Lakeshore Road' AND `v`.`Ship
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` 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`
FROM `ValuedCustomer` AS `v` FROM `ValuedCustomer` AS `v`
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 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")}
"""); """);
} }
@ -631,7 +631,7 @@ WHERE `v`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressL
await base.Contains_over_struct_complex_type(async); await base.Contains_over_struct_complex_type(async);
AssertSql( AssertSql(
""" $"""
@__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255) @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 255)
@__entity_equality_address_0_ZipCode='38654' (Nullable = true) @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
@__entity_equality_address_0_Country_Code='US' (Size = 255) @__entity_equality_address_0_Country_Code='US' (Size = 255)
@ -642,7 +642,7 @@ FROM `ValuedCustomer` AS `v`
WHERE EXISTS ( WHERE EXISTS (
SELECT 1 SELECT 1
FROM `ValuedCustomer` AS `v0` FROM `ValuedCustomer` AS `v0`
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) 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")})
"""); """);
} }

@ -165,7 +165,7 @@ VALUES ({AssertSqlHelper.Parameter("@p0")}, {AssertSqlHelper.Parameter("@p1")});
@p0='repairman' (Size = 255) @p0='repairman' (Size = 255)
@p1='Trek Pro Fit Madone 6 Series' (Nullable = false) (Size = 255) @p1='Trek Pro Fit Madone 6 Series' (Nullable = false) (Size = 255)
UPDATE `Vehicles` SET `Operator_Name` = @p0 UPDATE `Vehicles` SET `Operator_Name` = {AssertSqlHelper.Parameter("@p0")}
WHERE `Name` = {AssertSqlHelper.Parameter("@p1")}; WHERE `Name` = {AssertSqlHelper.Parameter("@p1")};
SELECT @@ROWCOUNT; SELECT @@ROWCOUNT;
""", """,

Loading…
Cancel
Save