Mirror
/
SiteServer-CMS
mirror of https://github.com/siteserver/cms.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

6.7

pull/1983/head siteserver-v6.7.1
starlying 7 years ago
parent
146e415392
commit
b01b59b136
2 changed files with 30 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      SiteServer.CMS/Provider/DatabaseDao.cs
  2. 8
      SiteServer.Web/Web.config

35
SiteServer.CMS/Provider/DatabaseDao.cs
View File

@ -1951,22 +1951,35 @@ SET IDENTITY_INSERT {tableName} OFF
orderSqlString = "ORDER BY Id DESC";
}
if (offset == 0 && limit == 0)
{
return $@"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString}";
}
if (WebConfigUtils.DatabaseType == DatabaseType.MySql)
{
retval = $@"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} LIMIT {limit} OFFSET {offset}";
retval = limit == 0
? $@"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset}"
: $@"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} LIMIT {limit} OFFSET {offset}";
}
else if (WebConfigUtils.DatabaseType == DatabaseType.SqlServer)
else if (WebConfigUtils.DatabaseType == DatabaseType.SqlServer && IsSqlServer2012)
{
if (IsSqlServer2012)
{
retval = $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset} ROWS FETCH NEXT {limit} ROWS ONLY";
}
else 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";
}
else if (WebConfigUtils.DatabaseType == DatabaseType.SqlServer && !IsSqlServer2012)
{
if (offset == 0)
{
retval = $"SELECT TOP {limit} {columnNames} FROM {tableName} {whereSqlString} {orderSqlString}";
}
else
{
if (limit == 0)
{
limit = DataProvider.DatabaseDao.GetIntResult($"SELECT COUNT(*) FROM {tableName} {whereSqlString}");
}
orderSqlString = orderSqlString.ToUpper();
var orderSqlStringReverse = orderSqlString.Replace(" DESC", " DESC2");
orderSqlStringReverse = orderSqlStringReverse.Replace(" ASC", " DESC");
@ -1982,11 +1995,15 @@ SELECT * FROM (
}
else if (WebConfigUtils.DatabaseType == DatabaseType.PostgreSql)
{
retval = $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} LIMIT {limit} OFFSET {offset}";
retval = limit == 0
? $@"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset}"
: $@"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} LIMIT {limit} OFFSET {offset}";
}
else if (WebConfigUtils.DatabaseType == DatabaseType.Oracle)
{
retval = $"SELECT {columnNames} FROM {tableName} {whereSqlString} {orderSqlString} OFFSET {offset} ROWS FETCH NEXT {limit} ROWS ONLY";
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";
}
return retval;

8
SiteServer.Web/Web.config
View File

@ -9,13 +9,13 @@
<add key="AdminDirectory" value="SiteServer" />
<add key="HomeDirectory" value="Home" />
<add key="SecretKey" value="81cef9bf3fe5c612" />
<!-- <add key="DatabaseType" value="SqlServer" />
<add key="ConnectionString" value="Server=dev.siteserver.cn;Uid=sa;Pwd=Brtech88;Database=update;" /> -->
<add key="DatabaseType" value="SqlServer" />
<add key="ConnectionString" value="Server=dev.siteserver.cn;Uid=sa;Pwd=Brtech88;Database=update;" />
<!-- <add key="ConnectionString" value="Server=dev.siteserver.cn;Uid=sa;Pwd=Brtech88;Database=008;" /> -->
<!-- <add key="DatabaseType" value="MySql" />
<add key="ConnectionString" value="server=dev.siteserver.cn;uid=root;pwd=Brtech88;database=6.0;SslMode=none;CharSet=utf8;" /> -->
<add key="DatabaseType" value="Oracle" />
<add key="ConnectionString" value="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=dev.siteserver.cn)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=CMS)));User ID=SITESERVER;Password=BRtech88;pooling=false;" />
<!-- <add key="DatabaseType" value="Oracle" />
<add key="ConnectionString" value="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=dev.siteserver.cn)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=CMS)));User ID=SITESERVER;Password=BRtech88;pooling=false;" /> -->
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。

Write Preview
Loading…
Cancel
Save