优化SQLBuilder

junjie-sun · Oct 22, 2019 · 2d3ee93 · 2d3ee93
1 parent f459243
commit 2d3ee93
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/doc/更新日志.txt b/doc/更新日志.txt
@@ -123,4 +123,10 @@ XDbAccess.MySql
 1.3.1
 ����ע��
 
---------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+2019-10-23
+XDbAccess Tag��1.3.2
+
+XDbAccess.Common
+MSSqlSQLBuilder��MySqlSQLBuilder���BuidlPagedQuerySql��BuildQueryCountSql�����Ż�Where�Ӿ�������߼�
diff --git a/src/XDbAccess.AutoTrans/XDbAccess.AutoTrans.csproj b/src/XDbAccess.AutoTrans/XDbAccess.AutoTrans.csproj
@@ -8,7 +8,7 @@
     <PackageLicenseUrl>https://github.com/junjie-sun/XDbAccess/blob/master/LICENSE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/junjie-sun/XDbAccess</PackageProjectUrl>
     <PackageTags>xdbaccess,db,transaction</PackageTags>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/src/XDbAccess.Common/SQLBuilder/MSSqlSQLBuilder.cs b/src/XDbAccess.Common/SQLBuilder/MSSqlSQLBuilder.cs
@@ -187,10 +187,10 @@ public string BuidlPagedQuerySql(PagedQueryOptions options)
 
             var sql = string.Format(@"SELECT * FROM (
                     SELECT {0},ROW_NUMBER() OVER(ORDER BY {1}) AS RowNumber FROM {2}
-                    WHERE 1=1 {3}
+                    WHERE {3}
                 ) as pageTable where RowNumber>={4} and RowNumber<={5};",
                 options.SqlFieldsPart, options.SqlOrderPart, options.SqlFromPart,
-                string.IsNullOrEmpty(options.SqlConditionPart) ? string.Empty : "AND " + options.SqlConditionPart, pageStartIndex, pageEndIndex);
+                options.SqlConditionPart, pageStartIndex, pageEndIndex);
 
             return sql;
         }
@@ -208,8 +208,8 @@ public string BuildQueryCountSql(string sqlFromPart, string sqlConditionPart = n
                 throw new ArgumentNullException("Need to specify sqlFromPart");
             }
 
-            var sql = string.Format(" SELECT COUNT(1) FROM {0} where 1=1 {1}  ;"
-                , sqlFromPart, string.IsNullOrEmpty(sqlConditionPart) ? string.Empty : "AND " + sqlConditionPart);
+            var sql = string.Format(" SELECT COUNT(1) FROM {0} where {1};"
+                , sqlFromPart, sqlConditionPart);
 
             return sql;
         }

diff --git a/src/XDbAccess.Common/SQLBuilder/MySqlSQLBuilder.cs b/src/XDbAccess.Common/SQLBuilder/MySqlSQLBuilder.cs
@@ -185,8 +185,8 @@ public string BuidlPagedQuerySql(PagedQueryOptions options)
             int pageStartIndex = options.PageSize * options.PageIndex;
             int currentPageCount = options.PageSize;
 
-            var sql = string.Format(@"SELECT {0} FROM {1} WHERE 1=1 {2} {3} LIMIT {4},{5};",
-                options.SqlFieldsPart, options.SqlFromPart, string.IsNullOrEmpty(options.SqlConditionPart) ? string.Empty : "AND " + options.SqlConditionPart,
+            var sql = string.Format(@"SELECT {0} FROM {1} WHERE {2} {3} LIMIT {4},{5};",
+                options.SqlFieldsPart, options.SqlFromPart, options.SqlConditionPart,
                 string.IsNullOrEmpty(options.SqlOrderPart) ? string.Empty : "ORDER BY " + options.SqlOrderPart, pageStartIndex, currentPageCount);
 
             return sql;
@@ -205,8 +205,8 @@ public string BuildQueryCountSql(string sqlFromPart, string sqlConditionPart = n
                 throw new ArgumentNullException("Need to specify sqlFromPart");
             }
 
-            var sql = string.Format(" SELECT COUNT(1) FROM {0} where 1=1 {1}  ;"
-                , sqlFromPart, string.IsNullOrEmpty(sqlConditionPart) ? string.Empty : "AND " + sqlConditionPart);
+            var sql = string.Format(" SELECT COUNT(1) FROM {0} where {1};"
+                , sqlFromPart, sqlConditionPart);
 
             return sql;
         }

diff --git a/src/XDbAccess.Common/XDbAccess.Common.csproj b/src/XDbAccess.Common/XDbAccess.Common.csproj
@@ -7,7 +7,7 @@
     <PackageLicenseUrl>https://github.com/junjie-sun/XDbAccess/blob/master/LICENSE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/junjie-sun/XDbAccess</PackageProjectUrl>
     <PackageTags>xdbaccess,db</PackageTags>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/src/XDbAccess.Dapper/XDbAccess.Dapper.csproj b/src/XDbAccess.Dapper/XDbAccess.Dapper.csproj
@@ -7,7 +7,7 @@
     <PackageLicenseUrl>https://github.com/junjie-sun/XDbAccess/blob/master/LICENSE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/junjie-sun/XDbAccess</PackageProjectUrl>
     <PackageTags>xdbaccess,db,dapper</PackageTags>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/src/XDbAccess.MSSql/XDbAccess.MSSql.csproj b/src/XDbAccess.MSSql/XDbAccess.MSSql.csproj
@@ -7,7 +7,7 @@
     <PackageTags>xdbaccess</PackageTags>
     <PackageLicenseUrl>https://github.com/junjie-sun/XDbAccess/blob/master/LICENSE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/junjie-sun/XDbAccess</PackageProjectUrl>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/src/XDbAccess.MySql/XDbAccess.MySql.csproj b/src/XDbAccess.MySql/XDbAccess.MySql.csproj
@@ -7,7 +7,7 @@
     <PackageLicenseUrl>https://github.com/junjie-sun/XDbAccess/blob/master/LICENSE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/junjie-sun/XDbAccess</PackageProjectUrl>
     <PackageTags>xdbaccess</PackageTags>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">