Test fixes for escaping wild chars

pull/137/head
Christopher Jolly 3 years ago
parent 78f3dbae15
commit b23483ce45

@ -54,6 +54,16 @@ FROM `Customers` AS `c`
WHERE `c`.`ContactName` LIKE '!%' ESCAPE '!'"); WHERE `c`.`ContactName` LIKE '!%' ESCAPE '!'");
} }
public override Task Like_all_literals(bool async)
{
return base.Like_all_literals(async);
}
public override Task Like_all_literals_with_escape(bool async)
{
return base.Like_all_literals_with_escape(async);
}
[ConditionalFact] [ConditionalFact]
public virtual void DateDiff_Year() public virtual void DateDiff_Year()
{ {

@ -22,36 +22,52 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query
await base.String_contains_on_argument_with_wildcard_constant(isAsync); await base.String_contains_on_argument_with_wildcard_constant(isAsync);
AssertSql( AssertSql(
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`FirstName`
WHERE CHARINDEX('%B', `f`.`FirstName`) > 0", FROM `FunkyCustomers` AS `f`
// WHERE `f`.`FirstName` LIKE '%[%]B%'
$@"SELECT `f`.`FirstName` """,
FROM `FunkyCustomers` AS `f` //
WHERE CHARINDEX('a_', `f`.`FirstName`) > 0", """
// SELECT `f`.`FirstName`
$@"SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f`
FROM `FunkyCustomers` AS `f` WHERE `f`.`FirstName` LIKE '%a[_]%'
WHERE CHARINDEX(NULL, `f`.`FirstName`) > 0", """,
// //
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f`", SELECT `f`.`FirstName`
// FROM `FunkyCustomers` AS `f`
$@"SELECT `f`.`FirstName` WHERE `f`.`FirstName` LIKE NULL
FROM `FunkyCustomers` AS `f` """,
WHERE CHARINDEX('_Ba_', `f`.`FirstName`) > 0", //
// """
$@"SELECT `f`.`FirstName` SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f` FROM `FunkyCustomers` AS `f`
WHERE CHARINDEX('%B%a%r', `f`.`FirstName`) <= 0", """,
// //
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`FirstName`
WHERE False = True", FROM `FunkyCustomers` AS `f`
// WHERE `f`.`FirstName` LIKE '%[_]Ba[_]%'
$@"SELECT `f`.`FirstName` """,
FROM `FunkyCustomers` AS `f` //
WHERE CHARINDEX(NULL, `f`.`FirstName`) <= 0"); """
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE NOT (`f`.`FirstName` LIKE '%[%]B[%]a[%]r%')
""",
//
"""
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE 0 = 1
""",
//
"""
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE NOT (`f`.`FirstName` LIKE NULL)
""");
} }
public override async Task String_contains_on_argument_with_wildcard_parameter(bool isAsync) public override async Task String_contains_on_argument_with_wildcard_parameter(bool isAsync)
@ -137,36 +153,52 @@ WHERE NOT ((`f0`.`LastName` LIKE '') OR INSTR(1, `f`.`FirstName`, `f0`.`LastName
await base.String_starts_with_on_argument_with_wildcard_constant(isAsync); await base.String_starts_with_on_argument_with_wildcard_constant(isAsync);
AssertSql( AssertSql(
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`FirstName`
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE '\%B%' ESCAPE '\')", FROM `FunkyCustomers` AS `f`
// WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE '[%]B%')
$@"SELECT `f`.`FirstName` """,
FROM `FunkyCustomers` AS `f` //
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE 'a\_%' ESCAPE '\')", """
// SELECT `f`.`FirstName`
$@"SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f`
FROM `FunkyCustomers` AS `f` WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE 'a[_]%')
WHERE False = True", """,
// //
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f`", SELECT `f`.`FirstName`
// FROM `FunkyCustomers` AS `f`
$@"SELECT `f`.`FirstName` WHERE 0 = 1
FROM `FunkyCustomers` AS `f` """,
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE '\_Ba\_%' ESCAPE '\')", //
// """
$@"SELECT `f`.`FirstName` SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f` FROM `FunkyCustomers` AS `f`
WHERE `f`.`FirstName` IS NOT NULL AND NOT (`f`.`FirstName` LIKE '\%B\%a\%r%' ESCAPE '\')", """,
// //
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`FirstName`
WHERE False = True", FROM `FunkyCustomers` AS `f`
// WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE '[_]Ba[_]%')
$@"SELECT `f`.`FirstName` """,
FROM `FunkyCustomers` AS `f` //
WHERE False = True"); """
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE (`f`.`FirstName` IS NOT NULL) AND NOT (`f`.`FirstName` LIKE '[%]B[%]a[%]r%')
""",
//
"""
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE 0 = 1
""",
//
"""
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE 0 = 1
""");
} }
public override async Task String_starts_with_on_argument_with_wildcard_parameter(bool isAsync) public override async Task String_starts_with_on_argument_with_wildcard_parameter(bool isAsync)
@ -236,39 +268,59 @@ WHERE 0 = 1");
await base.String_starts_with_on_argument_with_bracket(isAsync); await base.String_starts_with_on_argument_with_bracket(isAsync);
AssertSql( AssertSql(
$@"SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE '\[%' ESCAPE '\')", FROM `FunkyCustomers` AS `f`
// WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE '[[]%')
$@"SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` """,
FROM `FunkyCustomers` AS `f` //
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE 'B\[%' ESCAPE '\')", """
// SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
$@"SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` FROM `FunkyCustomers` AS `f`
FROM `FunkyCustomers` AS `f` WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE 'B[[]%')
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE 'B\[\[a^%' ESCAPE '\')", """,
// //
$@"{AssertSqlHelper.Declaration("@__prm1_0='[' (Size = 4000)")} """
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` FROM `FunkyCustomers` AS `f`
FROM `FunkyCustomers` AS `f` WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE 'B[[][[]a[^]%')
WHERE ({AssertSqlHelper.Parameter("@__prm1_0")} = '') OR (`f`.`FirstName` IS NOT NULL AND (LEFT(`f`.`FirstName`, LEN({AssertSqlHelper.Parameter("@__prm1_0")})) = {AssertSqlHelper.Parameter("@__prm1_0")}))", """,
// //
$@"{AssertSqlHelper.Declaration("@__prm2_0='B[' (Size = 4000)")} """
@__prm1_0='[' (Size = 255)
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` @__prm1_0='[' (Size = 255)
FROM `FunkyCustomers` AS `f` @__prm1_0='[' (Size = 255)
WHERE ({AssertSqlHelper.Parameter("@__prm2_0")} = '') OR (`f`.`FirstName` IS NOT NULL AND (LEFT(`f`.`FirstName`, LEN({AssertSqlHelper.Parameter("@__prm2_0")})) = {AssertSqlHelper.Parameter("@__prm2_0")}))",
// SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
$@"{AssertSqlHelper.Declaration("@__prm3_0='B[[a^' (Size = 4000)")} FROM `FunkyCustomers` AS `f`
WHERE @__prm1_0 = '' OR ((`f`.`FirstName` IS NOT NULL) AND LEFT(`f`.`FirstName`, LEN(@__prm1_0)) = @__prm1_0)
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` """,
FROM `FunkyCustomers` AS `f` //
WHERE ({AssertSqlHelper.Parameter("@__prm3_0")} = '') OR (`f`.`FirstName` IS NOT NULL AND (LEFT(`f`.`FirstName`, LEN({AssertSqlHelper.Parameter("@__prm3_0")})) = {AssertSqlHelper.Parameter("@__prm3_0")}))", """
// @__prm2_0='B[' (Size = 255)
$@"SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` @__prm2_0='B[' (Size = 255)
FROM `FunkyCustomers` AS `f` @__prm2_0='B[' (Size = 255)
WHERE (`f`.`LastName` = '') OR (`f`.`FirstName` IS NOT NULL AND (`f`.`LastName` IS NOT NULL AND (LEFT(`f`.`FirstName`, LEN(`f`.`LastName`)) = `f`.`LastName`)))");
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
FROM `FunkyCustomers` AS `f`
WHERE @__prm2_0 = '' OR ((`f`.`FirstName` IS NOT NULL) AND LEFT(`f`.`FirstName`, LEN(@__prm2_0)) = @__prm2_0)
""",
//
"""
@__prm3_0='B[[a^' (Size = 255)
@__prm3_0='B[[a^' (Size = 255)
@__prm3_0='B[[a^' (Size = 255)
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
FROM `FunkyCustomers` AS `f`
WHERE @__prm3_0 = '' OR ((`f`.`FirstName` IS NOT NULL) AND LEFT(`f`.`FirstName`, LEN(@__prm3_0)) = @__prm3_0)
""",
//
"""
SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool`
FROM `FunkyCustomers` AS `f`
WHERE `f`.`LastName` = '' OR ((`f`.`FirstName` IS NOT NULL) AND (`f`.`LastName` IS NOT NULL) AND LEFT(`f`.`FirstName`, LEN(`f`.`LastName`)) = `f`.`LastName`)
""");
} }
public override async Task String_starts_with_on_argument_with_wildcard_column(bool isAsync) public override async Task String_starts_with_on_argument_with_wildcard_column(bool isAsync)
@ -298,36 +350,52 @@ WHERE (`f0`.`LastName` <> '' OR (`f0`.`LastName` IS NULL)) AND (`f`.`FirstName`
await base.String_ends_with_on_argument_with_wildcard_constant(isAsync); await base.String_ends_with_on_argument_with_wildcard_constant(isAsync);
AssertSql( AssertSql(
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`FirstName`
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE '%\%B' ESCAPE '\')", FROM `FunkyCustomers` AS `f`
// WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE '%[%]B')
$@"SELECT `f`.`FirstName` """,
FROM `FunkyCustomers` AS `f` //
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE '%a\_' ESCAPE '\')", """
// SELECT `f`.`FirstName`
$@"SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f`
FROM `FunkyCustomers` AS `f` WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE '%a[_]')
WHERE False = True", """,
// //
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f`", SELECT `f`.`FirstName`
// FROM `FunkyCustomers` AS `f`
$@"SELECT `f`.`FirstName` WHERE 0 = 1
FROM `FunkyCustomers` AS `f` """,
WHERE `f`.`FirstName` IS NOT NULL AND (`f`.`FirstName` LIKE '%\_Ba\_' ESCAPE '\')", //
// """
$@"SELECT `f`.`FirstName` SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f` FROM `FunkyCustomers` AS `f`
WHERE `f`.`FirstName` IS NOT NULL AND NOT (`f`.`FirstName` LIKE '%\%B\%a\%r' ESCAPE '\')", """,
// //
$@"SELECT `f`.`FirstName` """
FROM `FunkyCustomers` AS `f` SELECT `f`.`FirstName`
WHERE False = True", FROM `FunkyCustomers` AS `f`
// WHERE (`f`.`FirstName` IS NOT NULL) AND (`f`.`FirstName` LIKE '%[_]Ba[_]')
$@"SELECT `f`.`FirstName` """,
FROM `FunkyCustomers` AS `f` //
WHERE False = True"); """
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE (`f`.`FirstName` IS NOT NULL) AND NOT (`f`.`FirstName` LIKE '%[%]B[%]a[%]r')
""",
//
"""
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE 0 = 1
""",
//
"""
SELECT `f`.`FirstName`
FROM `FunkyCustomers` AS `f`
WHERE 0 = 1
""");
} }
public override async Task String_ends_with_on_argument_with_wildcard_parameter(bool isAsync) public override async Task String_ends_with_on_argument_with_wildcard_parameter(bool isAsync)

Loading…
Cancel
Save