From 0db31fcb2efbbdaafb152ad6a79c0fdada7374d8 Mon Sep 17 00:00:00 2001 From: Christopher Jolly Date: Mon, 4 Mar 2024 04:24:19 +0800 Subject: [PATCH] Fix same parameter name on contains/startswith/endswith. See efcore#32432 --- .../JetSqlTranslatingExpressionVisitor.cs | 4 +- .../Query/FunkyDataQueryJetTest.cs | 84 +++++++++---------- ...orthwindFunctionsQueryJetTest.Functions.cs | 12 +-- .../NorthwindMiscellaneousQueryJetTest.cs | 8 +- .../NorthwindQueryFiltersQueryJetTest.cs | 72 ++++++++-------- 5 files changed, 91 insertions(+), 89 deletions(-) diff --git a/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs b/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs index e9d9636..ba3115b 100644 --- a/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs +++ b/src/EFCore.Jet/Query/Internal/JetSqlTranslatingExpressionVisitor.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Linq.Expressions; using System.Reflection; @@ -277,7 +278,8 @@ public class JetSqlTranslatingExpressionVisitor : RelationalSqlTranslatingExpres QueryCompilationContext.QueryContextParameter); var escapedPatternParameter = - _queryCompilationContext.RegisterRuntimeParameter(patternParameter.Name + "_rewritten", lambda); + _queryCompilationContext.RegisterRuntimeParameter( + $"{patternParameter.Name}_{methodType.ToString().ToLower(CultureInfo.InvariantCulture)}", lambda); translation = _sqlExpressionFactory.Like( translatedInstance, diff --git a/test/EFCore.Jet.FunctionalTests/Query/FunkyDataQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/FunkyDataQueryJetTest.cs index 5de5340..4dbb8af 100644 --- a/test/EFCore.Jet.FunctionalTests/Query/FunkyDataQueryJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/Query/FunkyDataQueryJetTest.cs @@ -76,19 +76,19 @@ FROM `FunkyCustomers` AS `f` AssertSql( $""" -@__prm1_0_rewritten='%[%]B%' (Size = 255) +@__prm1_0_contains='%[%]B%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_contains")} """, // $""" -@__prm2_0_rewritten='%a[_]%' (Size = 255) +@__prm2_0_contains='%a[_]%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_contains")} """, // """ @@ -98,35 +98,35 @@ WHERE 0 = 1 """, // $""" -@__prm4_0_rewritten='%' (Size = 255) +@__prm4_0_contains='%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm4_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm4_0_contains")} """, // $""" -@__prm5_0_rewritten='%[_]Ba[_]%' (Size = 255) +@__prm5_0_contains='%[_]Ba[_]%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm5_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm5_0_contains")} """, // $""" -@__prm6_0_rewritten='%[%]B[%]a[%]r%' (Size = 255) +@__prm6_0_contains='%[%]B[%]a[%]r%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm6_0_rewritten")} OR `f`.`FirstName` IS NULL +WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm6_0_contains")} OR `f`.`FirstName` IS NULL """, // $""" -@__prm7_0_rewritten='%' (Size = 255) +@__prm7_0_contains='%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm7_0_rewritten")} OR `f`.`FirstName` IS NULL +WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm7_0_contains")} OR `f`.`FirstName` IS NULL """, // """ @@ -220,19 +220,19 @@ FROM `FunkyCustomers` AS `f` AssertSql( $""" -@__prm1_0_rewritten='[%]B%' (Size = 255) +@__prm1_0_startswith='[%]B%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_startswith")} """, // $""" -@__prm2_0_rewritten='[_]B%' (Size = 255) +@__prm2_0_startswith='[_]B%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_startswith")} """, // """ @@ -242,35 +242,35 @@ WHERE 0 = 1 """, // $""" -@__prm4_0_rewritten='%' (Size = 255) +@__prm4_0_startswith='%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm4_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm4_0_startswith")} """, // $""" -@__prm5_0_rewritten='[_]Ba[_]%' (Size = 255) +@__prm5_0_startswith='[_]Ba[_]%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm5_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm5_0_startswith")} """, // $""" -@__prm6_0_rewritten='[%]B[%]a[%]r%' (Size = 255) +@__prm6_0_startswith='[%]B[%]a[%]r%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm6_0_rewritten")} OR `f`.`FirstName` IS NULL +WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm6_0_startswith")} OR `f`.`FirstName` IS NULL """, // $""" -@__prm7_0_rewritten='%' (Size = 255) +@__prm7_0_startswith='%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm7_0_rewritten")} OR `f`.`FirstName` IS NULL +WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm7_0_startswith")} OR `f`.`FirstName` IS NULL """, // """ @@ -303,27 +303,27 @@ WHERE `f`.`FirstName` LIKE 'B[[][[]a[^]%' """, // $""" -@__prm1_0_rewritten='[[]%' (Size = 255) +@__prm1_0_startswith='[[]%' (Size = 255) SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_startswith")} """, // $""" -@__prm2_0_rewritten='B[[]%' (Size = 255) +@__prm2_0_startswith='B[[]%' (Size = 255) SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_startswith")} """, // $""" -@__prm3_0_rewritten='B[[][[]a[^]%' (Size = 255) +@__prm3_0_startswith='B[[][[]a[^]%' (Size = 255) SELECT `f`.`Id`, `f`.`FirstName`, `f`.`LastName`, `f`.`NullableBool` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm3_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm3_0_startswith")} """, // """ @@ -418,19 +418,19 @@ FROM `FunkyCustomers` AS `f` AssertSql( $""" -@__prm1_0_rewritten='%[%]r' (Size = 255) +@__prm1_0_endswith='%[%]r' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm1_0_endswith")} """, // $""" -@__prm2_0_rewritten='%r[_]' (Size = 255) +@__prm2_0_endswith='%r[_]' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm2_0_endswith")} """, // """ @@ -440,35 +440,35 @@ WHERE 0 = 1 """, // $""" -@__prm4_0_rewritten='%' (Size = 255) +@__prm4_0_endswith='%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm4_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm4_0_endswith")} """, // $""" -@__prm5_0_rewritten='%[_]r[_]' (Size = 255) +@__prm5_0_endswith='%[_]r[_]' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm5_0_rewritten")} +WHERE `f`.`FirstName` LIKE {AssertSqlHelper.Parameter("@__prm5_0_endswith")} """, // $""" -@__prm6_0_rewritten='%a[%]r[%]' (Size = 255) +@__prm6_0_endswith='%a[%]r[%]' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm6_0_rewritten")} OR `f`.`FirstName` IS NULL +WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm6_0_endswith")} OR `f`.`FirstName` IS NULL """, // $""" -@__prm7_0_rewritten='%' (Size = 255) +@__prm7_0_endswith='%' (Size = 255) SELECT `f`.`FirstName` FROM `FunkyCustomers` AS `f` -WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm7_0_rewritten")} OR `f`.`FirstName` IS NULL +WHERE `f`.`FirstName` NOT LIKE {AssertSqlHelper.Parameter("@__prm7_0_endswith")} OR `f`.`FirstName` IS NULL """, // """ diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindFunctionsQueryJetTest.Functions.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindFunctionsQueryJetTest.Functions.cs index fbf11a1..26f9a55 100644 --- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindFunctionsQueryJetTest.Functions.cs +++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindFunctionsQueryJetTest.Functions.cs @@ -104,11 +104,11 @@ WHERE `c`.`ContactName` LIKE 'M%' AssertSql( $""" -@__pattern_0_rewritten='M%' (Size = 30) +@__pattern_0_startswith='M%' (Size = 30) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`ContactName` LIKE {AssertSqlHelper.Parameter("@__pattern_0_rewritten")} +WHERE `c`.`ContactName` LIKE {AssertSqlHelper.Parameter("@__pattern_0_startswith")} """); } @@ -166,11 +166,11 @@ WHERE `c`.`ContactName` LIKE '%b' AssertSql( $""" -@__pattern_0_rewritten='%b' (Size = 30) +@__pattern_0_endswith='%b' (Size = 30) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`ContactName` LIKE {AssertSqlHelper.Parameter("@__pattern_0_rewritten")} +WHERE `c`.`ContactName` LIKE {AssertSqlHelper.Parameter("@__pattern_0_endswith")} """); } @@ -267,11 +267,11 @@ WHERE `c`.`ContactName` LIKE '% %' AssertSql( $""" -@__pattern_0_rewritten='% %' (Size = 30) +@__pattern_0_contains='% %' (Size = 30) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`ContactName` LIKE {AssertSqlHelper.Parameter("@__pattern_0_rewritten")} +WHERE `c`.`ContactName` LIKE {AssertSqlHelper.Parameter("@__pattern_0_contains")} """); } diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs index 09f6f8a..9a7566c 100644 --- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindMiscellaneousQueryJetTest.cs @@ -2803,12 +2803,12 @@ WHERE `o`.`OrderDate` > CDATE({AssertSqlHelper.Parameter("@__p_0")})"); AssertSql( $""" -@__NewLine_0_rewritten='% +@__NewLine_0_contains='% %' (Size = 5) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`CustomerID` LIKE {AssertSqlHelper.Parameter("@__NewLine_0_rewritten")} +WHERE `c`.`CustomerID` LIKE {AssertSqlHelper.Parameter("@__NewLine_0_contains")} """); } @@ -4373,11 +4373,11 @@ FROM ( AssertSql( $""" -@__prefix_0_rewritten='A%' (Size = 5) +@__prefix_0_startswith='A%' (Size = 5) SELECT `c`.`CustomerID` FROM `Customers` AS `c` -WHERE `c`.`CustomerID` LIKE {AssertSqlHelper.Parameter("@__prefix_0_rewritten")} +WHERE `c`.`CustomerID` LIKE {AssertSqlHelper.Parameter("@__prefix_0_startswith")} """); } diff --git a/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs index 2bd4601..4cac9dc 100644 --- a/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/Query/NorthwindQueryFiltersQueryJetTest.cs @@ -31,11 +31,11 @@ namespace EntityFrameworkCore.Jet.FunctionalTests.Query AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT COUNT(*) FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -45,11 +45,11 @@ WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -59,12 +59,12 @@ WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) @__p_0='ALFKI' (Size = 5) SELECT TOP 1 `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")}) AND `c`.`CustomerID` = {AssertSqlHelper.Parameter("@__p_0")} +WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")}) AND `c`.`CustomerID` = {AssertSqlHelper.Parameter("@__p_0")} """); } @@ -74,11 +74,11 @@ WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPr AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='F%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='F%' (Size = 40) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -88,19 +88,19 @@ WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """, // $""" -@__ef_filter__TenantPrefix_0_rewritten='T%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='T%' (Size = 40) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -110,11 +110,11 @@ WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='F%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='F%' (Size = 40) SELECT `c`.`CustomerID` FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -124,11 +124,11 @@ WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `c`.`CustomerID` FROM `Customers` AS `c` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -138,8 +138,8 @@ WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`CustomerID0` FROM `Customers` AS `c` @@ -149,11 +149,11 @@ LEFT JOIN ( LEFT JOIN ( SELECT `c0`.`CustomerID`, `c0`.`CompanyName` FROM `Customers` AS `c0` - WHERE `c0`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} + WHERE `c0`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} ) AS `t` ON `o`.`CustomerID` = `t`.`CustomerID` WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL ) AS `t0` ON `c`.`CustomerID` = `t0`.`CustomerID` -WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} ORDER BY `c`.`CustomerID`, `t0`.`OrderID` """); } @@ -175,14 +175,14 @@ ORDER BY `c`.`CustomerID`"); AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region` FROM `Orders` AS `o` LEFT JOIN ( SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` - WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} + WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} ) AS `t` ON `o`.`CustomerID` = `t`.`CustomerID` WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL """); @@ -194,7 +194,7 @@ WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL AssertSql( $""" -@__ef_filter__TenantPrefix_1_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_1_startswith='B%' (Size = 40) @__ef_filter___quantity_0='50' SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate` @@ -205,7 +205,7 @@ INNER JOIN ( LEFT JOIN ( SELECT `c`.`CustomerID`, `c`.`CompanyName` FROM `Customers` AS `c` - WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_1_rewritten")} + WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_1_startswith")} ) AS `t` ON `o0`.`CustomerID` = `t`.`CustomerID` WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL ) AS `t0` ON `o`.`OrderID` = `t0`.`OrderID` @@ -256,13 +256,13 @@ WHERE (({AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0")} = '') OR ((` AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `m`.`CustomerID`, `m`.`Address`, `m`.`City`, `m`.`CompanyName`, `m`.`ContactName`, `m`.`ContactTitle`, `m`.`Country`, `m`.`Fax`, `m`.`Phone`, `m`.`PostalCode`, `m`.`Region` FROM ( select * from Customers ) AS `m` -WHERE `m`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} +WHERE `m`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} """); } @@ -278,7 +278,7 @@ WHERE `m`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPre AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `m`.`OrderID`, `m`.`CustomerID`, `m`.`EmployeeID`, `m`.`OrderDate` FROM ( @@ -287,7 +287,7 @@ FROM ( LEFT JOIN ( SELECT `c`.`CustomerID`, `c`.`CompanyName` FROM `Customers` AS `c` - WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} + WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} ) AS `t` ON `m`.`CustomerID` = `t`.`CustomerID` WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL """); @@ -299,21 +299,21 @@ WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) @__customerID='BERGS' (Size = 5) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")}) AND `c`.`CustomerID` = {AssertSqlHelper.Parameter("@__customerID")} +WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")}) AND `c`.`CustomerID` = {AssertSqlHelper.Parameter("@__customerID")} """, // $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) @__customerID='BLAUS' (Size = 5) SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` -WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")}) AND `c`.`CustomerID` = {AssertSqlHelper.Parameter("@__customerID")} +WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")}) AND `c`.`CustomerID` = {AssertSqlHelper.Parameter("@__customerID")} """); } @@ -323,14 +323,14 @@ WHERE (`c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPr AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate` FROM `Orders` AS `o` LEFT JOIN ( SELECT `c`.`CustomerID`, `c`.`CompanyName` FROM `Customers` AS `c` - WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} + WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} ) AS `t` ON `o`.`CustomerID` = `t`.`CustomerID` WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL """); @@ -349,14 +349,14 @@ WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL AssertSql( $""" -@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40) +@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40) SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region` FROM `Orders` AS `o` LEFT JOIN ( SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region` FROM `Customers` AS `c` - WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_rewritten")} + WHERE `c`.`CompanyName` LIKE {AssertSqlHelper.Parameter("@__ef_filter__TenantPrefix_0_startswith")} ) AS `t` ON `o`.`CustomerID` = `t`.`CustomerID` WHERE `t`.`CustomerID` IS NOT NULL AND `t`.`CompanyName` IS NOT NULL """);