- 修复 .Contains('b%') 部分数据库函数参数位置错误；#1826

dotnetcore · Jun 19, 2024 · 20b8824 · 20b8824
1 parent 6bf4c21
commit 20b8824
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 54 deletions.
diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlExpression.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlExpression.cs
@@ -316,7 +316,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"locate({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";
                             return $"locate({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"concat({args0Value}, '%')")}";

diff --git a/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleExpression.cs b/Providers/FreeSql.Provider.Custom/Oracle/CustomOracleExpression.cs
@@ -318,9 +318,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = length({args0Value})";
-                            return $"instr({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";
+                            return $"instr({left}, {args0Value}, 1, 1) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(to_char({args0Value})||'%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%'||to_char({args0Value}))")}";

diff --git a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLExpression.cs b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLExpression.cs
@@ -407,9 +407,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"strpos({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"strpos({args0Value}, {left}) = char_length({args0Value})";
-                            return $"strpos({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = char_length({left})-char_length({args0Value})+1";
+                            return $"strpos({left}, {args0Value}) > 0";
                         }
                         var likeOpt = "LIKE";
                         if (exp.Arguments.Count > 1)

diff --git a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerExpression.cs b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerExpression.cs
@@ -339,7 +339,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"charindex({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"charindex({args0Value}, {left}) = len({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"charindex({args0Value}, {left}) = len({left})-len({args0Value})+1";
                             return $"charindex({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(cast({args0Value} as nvarchar(max))+'%')")}";

diff --git a/Providers/FreeSql.Provider.Dameng/DamengExpression.cs b/Providers/FreeSql.Provider.Dameng/DamengExpression.cs
@@ -318,9 +318,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = length({args0Value})";
-                            return $"instr({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";
+                            return $"instr({left}, {args0Value}, 1, 1) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(to_char({args0Value})||'%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%'||to_char({args0Value}))")}";

diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs b/Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs
@@ -306,7 +306,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"position({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"position({args0Value}, {left}) = char_length({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"position({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";
                             return $"position({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"({args0Value})||'%'")}";

diff --git a/Providers/FreeSql.Provider.GBase/GBaseExpression.cs b/Providers/FreeSql.Provider.GBase/GBaseExpression.cs
@@ -306,7 +306,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = char_length({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";
                             return $"instr({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"({args0Value})||'%'")}";

diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs
@@ -385,9 +385,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"strpos({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"strpos({args0Value}, {left}) = char_length({args0Value})";
-                            return $"strpos({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = char_length({left})-char_length({args0Value})+1";
+                            return $"strpos({left}, {args0Value}) > 0";
                         }
                         var likeOpt = "LIKE";
                         if (exp.Arguments.Count > 1)

diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs
@@ -279,9 +279,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = len({args0Value})";
-                            return $"instr({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}) = len({left})-len({args0Value})+1";
+                            return $"instr({left}, {args0Value}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"({args0Value}+'%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%'+{args0Value})")}";

diff --git a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
@@ -318,7 +318,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"locate({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";
                             return $"locate({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"concat({args0Value}, '%')")}";

diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs
@@ -318,9 +318,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = length({args0Value})";
-                            return $"instr({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";
+                            return $"instr({left}, {args0Value}, 1, 1) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(to_char({args0Value})||'%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%'||to_char({args0Value}))")}";

diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs
@@ -385,9 +385,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"strpos({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"strpos({args0Value}, {left}) = char_length({args0Value})";
-                            return $"strpos({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = char_length({left})-char_length({args0Value})+1";
+                            return $"strpos({left}, {args0Value}) > 0";
                         }
                         var likeOpt = "LIKE";
                         if (exp.Arguments.Count > 1)

diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
@@ -316,7 +316,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"locate({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"locate({args0Value}, {left}) = char_length({left})-char_length({args0Value})+1";
                             return $"locate({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"concat({args0Value}, '%')")}";

diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs
@@ -318,9 +318,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = length({args0Value})";
-                            return $"instr({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";
+                            return $"instr({left}, {args0Value}, 1, 1) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(to_char({args0Value})||'%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%'||to_char({args0Value}))")}";

diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
@@ -407,9 +407,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"strpos({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"strpos({args0Value}, {left}) = char_length({args0Value})";
-                            return $"strpos({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = char_length({left})-char_length({args0Value})+1";
+                            return $"strpos({left}, {args0Value}) > 0";
                         }
                         var likeOpt = "LIKE";
                         if (exp.Arguments.Count > 1)

diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs
@@ -339,7 +339,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value.Contains("%"))
                         {
                             if (exp.Method.Name == "StartsWith") return $"charindex({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"charindex({args0Value}, {left}) = len({args0Value})";
+                            if (exp.Method.Name == "EndsWith") return $"charindex({args0Value}, {left}) = len({left})-len({args0Value})+1";
                             return $"charindex({args0Value}, {left}) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(cast({args0Value} as nvarchar(max))+'%')")}";

diff --git a/Providers/FreeSql.Provider.Oracle/OracleExpression.cs b/Providers/FreeSql.Provider.Oracle/OracleExpression.cs
@@ -318,9 +318,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"instr({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"instr({args0Value}, {left}) = length({args0Value})";
-                            return $"instr({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"instr({left}, {args0Value}, 1, 1) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"instr({left}, {args0Value}, 1, 1) = length({left})-length({args0Value})+1";
+                            return $"instr({left}, {args0Value}, 1, 1) > 0";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(to_char({args0Value})||'%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%'||to_char({args0Value}))")}";

diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
@@ -438,9 +438,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"strpos({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith") return $"strpos({args0Value}, {left}) = char_length({args0Value})";
-                            return $"strpos({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = char_length({left})-char_length({args0Value})+1";
+                            return $"strpos({left}, {args0Value}) > 0";
                         }
                         var likeOpt = "LIKE";
                         if (exp.Arguments.Count > 1)

diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbExpression.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbExpression.cs
@@ -345,10 +345,9 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (args0Value == "NULL") return $"({left}) IS NULL";
                         if (args0Value.Contains("%"))
                         {
-                            if (exp.Method.Name == "StartsWith") return $"strpos({args0Value}, {left}) = 1";
-                            if (exp.Method.Name == "EndsWith")
-                                return $"strpos({args0Value}, {left}) = length({args0Value})";
-                            return $"strpos({args0Value}, {left}) > 0";
+                            if (exp.Method.Name == "StartsWith") return $"strpos({left}, {args0Value}) = 1";
+                            if (exp.Method.Name == "EndsWith") return $"strpos({left}, {args0Value}) = length({left})-length({args0Value})+1";
+                            return $"strpos({left}, {args0Value}) > 0";
                         }
 
                         var likeOpt = "LIKE";