From 262c3eddc1305fb26e782de6e70a34b504ed6f2b Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Fri, 14 Jul 2017 02:42:50 +0800
Subject: [PATCH] Update Mysql Sqlite

---
 .../MySql/SqlBuilder/MySqlQueryBuilder.cs     |  15 +++++++++------
 .../Sqlite/SqlBuilder/SqliteQueryBuilder.cs   |  13 ++++++++-----
 .../SqliteTest/DataBase/SqlSugar4xTest.sqlite | Bin 118784 -> 118784 bytes
 Src/Asp.Net/SqliteTest/SqliteTest.csproj      |   4 ----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs
index 74a7556ea..28ca4bb76 100644
--- a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs
@@ -35,31 +35,34 @@ namespace SqlSugar
         }
         public override string ToSqlString()
         {
+            string oldOrderValue = this.OrderByValue;
+            string result = null;
             sql = new StringBuilder();
             sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString);
             if (IsCount) { return sql.ToString(); }
             if (Skip != null && Take == null)
             {
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
-                return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString, Skip.ObjToInt(), long.MaxValue);
+                result = string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString, Skip.ObjToInt(), long.MaxValue);
             }
             else if (Skip == null && Take != null)
             {
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
-                return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, 1, Take.ObjToInt());
+                result = string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, 1, Take.ObjToInt());
             }
             else if (Skip != null && Take != null)
             {
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
-                return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt(): 0, Take);
+                result = string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt() : 0, Take);
             }
             else
             {
-                return sql.ToString();
+                result = sql.ToString();
             }
-
+            this.OrderByValue = oldOrderValue;
+            return result;
         }
-        
+
         #endregion
 
         #region Get SQL Partial
diff --git a/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs
index adafa5d53..20eb9dc65 100644
--- a/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteQueryBuilder.cs
@@ -35,29 +35,32 @@ namespace SqlSugar
         }
         public override string ToSqlString()
         {
+            string result = null;
+            string oldOrderBy = this.OrderByValue;
             sql = new StringBuilder();
             sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString);
             if (IsCount) { return sql.ToString(); }
             if (Skip != null && Take == null)
             {
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
-                return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString, Skip.ObjToInt(), long.MaxValue);
+                result= string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString, Skip.ObjToInt(), long.MaxValue);
             }
             else if (Skip == null && Take != null)
             {
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
-                return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, 1, Take.ObjToInt());
+                result= string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, 1, Take.ObjToInt());
             }
             else if (Skip != null && Take != null)
             {
                 if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
-                return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt(): 0, Take);
+                result= string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt(): 0, Take);
             }
             else
             {
-                return sql.ToString();
+                result= sql.ToString();
             }
-
+            this.OrderByValue = oldOrderBy;
+            return result;
         }
         
         #endregion
diff --git a/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite b/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite
index 81c2453d8a76d22e3f1ebafaca294108caa331a3..08e2f5609ccf2dec054d4840c1a52ebc59f89dbe 100644
GIT binary patch
delta 169
zcmZozz}~QceS$RO`-w8njPExlEaB&1;y=Q`|A7C<W*&i^{PIohp{xuX48}$Vh6cI@
zhCrlXU|<DCGEMCv+n>ZUDhMoQQ83udk`T$yXf!!4Us=~g!NADM#L&vvP|w2H%+S;n
zq}^QCz+Bf5Q)=_NeESW;R|Qy@RT*6pOA<p;i%UH7((;WKDHu!)VBgLj!1%Ks0I?%4
A3IG5A

delta 186
zcmZozz}~QceS$ROtBEqsjITB(EaB&15MTfS+08rxJNc~}zgGe|GEHqFKuV;k#SlnI
zH#PYIDXFH0Y#=4k_@4<#NjCnK2U6mVzioh&SmV#gO$xF8jE0lr@|AUs6buZlj4Z4S
zjP%SbOpQ$q&5aBU&2<gTbqz74Hm}RK-ynQhfQ4C=(Iv4YF(kFP#4|4~-*AzF!NdUe
K?d$=JKkEUB-7#4J

diff --git a/Src/Asp.Net/SqliteTest/SqliteTest.csproj b/Src/Asp.Net/SqliteTest/SqliteTest.csproj
index 37805c632..ed34794da 100644
--- a/Src/Asp.Net/SqliteTest/SqliteTest.csproj
+++ b/Src/Asp.Net/SqliteTest/SqliteTest.csproj
@@ -39,10 +39,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\SqlSugar\Lib\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />