From 339a57ffc8dc5db60fcb541a80e905a43782be1b Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Wed, 1 Apr 2020 14:02:26 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20MySql=20locate=20?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=87=BD=E6=95=B0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Providers/FreeSql.Provider.MySql/MySqlExpression.cs          | 4 ++--
 Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
index d7339eac..ee3ec1bb 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
@@ -278,9 +278,9 @@ namespace FreeSql.MySql
                             var locateArgs1 = getExp(exp.Arguments[1]);
                             if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString();
                             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":
                         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.Odbc/MySql/OdbcMySqlExpression.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
index 3fdf6e2a..cb2c6bf8 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
@@ -278,9 +278,9 @@ namespace FreeSql.Odbc.MySql
                             var locateArgs1 = getExp(exp.Arguments[1]);
                             if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString();
                             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":
                         if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})";
                         return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";