diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdapter.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdapter.cs index a1dd0314..745091fe 100644 --- a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdapter.cs +++ b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdapter.cs @@ -105,7 +105,7 @@ namespace FreeSql.Odbc.Default public virtual string LambdaString_ToLower(string operand) => $"lower({operand})"; public virtual string LambdaString_ToUpper(string operand) => $"upper({operand})"; public virtual string LambdaString_Substring(string operand, string startIndex, string length) => string.IsNullOrEmpty(length) ? $"left({operand}, {startIndex})" : $"substring({operand}, {startIndex}, {length})"; - public virtual string LambdaString_IndexOf(string operand, string value, string startIndex) => string.IsNullOrEmpty(startIndex) ? $"(charindex({operand}, {value})-1)" : $"(charindex({operand}, {value}, {startIndex})-1)"; + public virtual string LambdaString_IndexOf(string operand, string value, string startIndex) => string.IsNullOrEmpty(startIndex) ? $"(charindex({value}, {operand})-1)" : $"(charindex({value}, {operand}, {startIndex})-1)"; public virtual string LambdaString_PadLeft(string operand, string length, string paddingChar) => string.IsNullOrEmpty(paddingChar) ? $"lpad({operand}, {length})" : $"lpad({operand}, {length}, {paddingChar})"; public virtual string LambdaString_PadRight(string operand, string length, string paddingChar) => string.IsNullOrEmpty(paddingChar) ? $"rpad({operand}, {length})" : $"rpad({operand}, {length}, {paddingChar})"; public virtual string LambdaString_Trim(string operand) => $"ltrim(rtrim({operand}))"; diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs index dcbdfec7..280a6181 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs @@ -282,9 +282,9 @@ namespace FreeSql.Odbc.SqlServer var locateArgs1 = getExp(exp.Arguments[1]); if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString(); else locateArgs1 += "+1"; - return $"(charindex({left}, {indexOfFindStr}, {locateArgs1})-1)"; + return $"(charindex({indexOfFindStr}, {left}, {locateArgs1})-1)"; } - return $"(charindex({left}, {indexOfFindStr})-1)"; + return $"(charindex({indexOfFindStr}, {left})-1)"; case "PadLeft": if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})"; return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs index 8aba97e0..4abd09ac 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs @@ -282,9 +282,9 @@ namespace FreeSql.SqlServer var locateArgs1 = getExp(exp.Arguments[1]); if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString(); else locateArgs1 += "+1"; - return $"(charindex({left}, {indexOfFindStr}, {locateArgs1})-1)"; + return $"(charindex({indexOfFindStr}, {left}, {locateArgs1})-1)"; } - return $"(charindex({left}, {indexOfFindStr})-1)"; + return $"(charindex({indexOfFindStr}, {left})-1)"; case "PadLeft": if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})"; return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";