tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 09:15:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 MySql locate 表达式函数参数位置的错误；

Browse Source
This commit is contained in:
28810
2020-04-01 14:02:26 +08:00
parent 55ae5bdc9b
commit 339a57ffc8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Providers/FreeSql.Provider.MySql/MySqlExpression.cs
View File

@@ -278,9 +278,9 @@ namespace FreeSql.MySql
var locateArgs1 = getExp(exp.Arguments[1]); var locateArgs1 = getExp(exp.Arguments[1]);
if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString(); if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString();
else locateArgs1 += "+1"; else locateArgs1 += "+1";
return $"(locate({left}, {indexOfFindStr}, {locateArgs1})-1)"; return $"(locate({indexOfFindStr}, {left}, {locateArgs1})-1)";
} }
return $"(locate({left}, {indexOfFindStr})-1)"; return $"(locate({indexOfFindStr}, {left})-1)";
case "PadLeft": case "PadLeft":
if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})"; if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})";
return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";

4
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
View File

@@ -278,9 +278,9 @@ namespace FreeSql.Odbc.MySql
var locateArgs1 = getExp(exp.Arguments[1]); var locateArgs1 = getExp(exp.Arguments[1]);
if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString(); if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString();
else locateArgs1 += "+1"; else locateArgs1 += "+1";
return $"(locate({left}, {indexOfFindStr}, {locateArgs1})-1)"; return $"(locate({indexOfFindStr}, {left}, {locateArgs1})-1)";
} }
return $"(locate({left}, {indexOfFindStr})-1)"; return $"(locate({indexOfFindStr}, {left})-1)";
case "PadLeft": case "PadLeft":
if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})"; if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})";
return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";