bugfix

siteserver · Jul 2, 2019 · 0353238 · 0353238
1 parent b2d5f56
commit 0353238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/SiteServer.CMS/Provider/DatabaseDao.cs b/SiteServer.CMS/Provider/DatabaseDao.cs
@@ -2023,28 +2023,25 @@ public string GetPageSqlString(string tableName, string columnNames, string wher
             }
             else if (WebConfigUtils.DatabaseType == DatabaseType.SqlServer && IsSqlServer2012)
             {
-                if (IsSqlServer2012)
+                retval = limit == 0
+                    ? $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset} ROWS"
+                    : $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset} ROWS FETCH NEXT {limit} ROWS ONLY";
+            }
+            else if (WebConfigUtils.DatabaseType == DatabaseType.SqlServer && !IsSqlServer2012)
+            {
+                if (offset == 0)
                 {
-                    retval = limit == 0
-                        ? $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset} ROWS"
-                        : $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset} ROWS FETCH NEXT {limit} ROWS ONLY";
+                    retval = $"SELECT TOP {limit} {columnNames} FROM {tableName} {whereSqlString} {orderSqlString}";
                 }
                 else
                 {
-                    if (offset == 0)
-                    {
-                        retval = $"SELECT TOP {limit} {columnNames} FROM {tableName} {whereSqlString} {orderSqlString}";
-                    }
-                    else
-                    {
-                        var rowWhere = limit == 0
-                            ? $@"WHERE [row_num] > {offset}"
-                            : $@"WHERE [row_num] BETWEEN {offset + 1} AND {offset + limit}";
+                    var rowWhere = limit == 0
+                        ? $@"WHERE [row_num] > {offset}"
+                        : $@"WHERE [row_num] BETWEEN {offset + 1} AND {offset + limit}";
 
-                        retval = $@"SELECT * FROM (
+                    retval = $@"SELECT * FROM (
     SELECT {columnNames}, ROW_NUMBER() OVER ({orderSqlString}) AS [row_num] FROM [{tableName}] {whereSqlString}
 ) as T {rowWhere}";
-                    }
                 }
             }
             else if (WebConfigUtils.DatabaseType == DatabaseType.PostgreSql)

diff --git a/SiteServer.Web/Web.config b/SiteServer.Web/Web.config
@@ -14,7 +14,6 @@
     <add key="SecretKey" value="54bb60d15c65c345" />
     <add key="DatabaseType" value="SqlServer" />
     <add key="ConnectionString" value="" />
-    <!-- <add key="ConnectionString" value="" /> -->
   </appSettings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。