Skip to content

Commit

Permalink
优化Page方法排序逻辑；
Browse files Browse the repository at this point in the history
  • Loading branch information
@zqlovejyc
zqlovejyc committed Dec 30, 2021
1 parent 0f8e7ed commit 4c06bfd
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 28 deletions.
4 changes: 2 additions & 2 deletions SQLBuilder.Core.UnitTest/SelectTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3349,7 +3349,7 @@ public void Test_Page_01()
o.Subject == "")
.Page(3, 2, "Id", "select * from student");

Assert.AreEqual(@"SELECT COUNT(*) AS `TOTAL` FROM (select * from student) AS T;SELECT * FROM (select * from student) AS T ORDER BY Id ASC LIMIT 3 OFFSET 3;", builder.Sql);
Assert.AreEqual(@"SELECT COUNT(*) AS `TOTAL` FROM (select * from student) AS T;select * from student ORDER BY Id ASC LIMIT 3 OFFSET 3;", builder.Sql);
Assert.AreEqual(0, builder.Parameters.Count);
}

Expand All @@ -3370,7 +3370,7 @@ public void Test_Page_02()
o.Subject == "")
.Page(3, 2, "`Id`");

Assert.AreEqual(@"SELECT COUNT(*) AS `TOTAL` FROM (SELECT * FROM `student` AS `t` WHERE `t`.`Score` IS NOT NULL AND (`t`.`Name` = ?p__1) OR (`t`.`Subject` = ?p__2)) AS T;SELECT * FROM (SELECT * FROM `student` AS `t` WHERE `t`.`Score` IS NOT NULL AND (`t`.`Name` = ?p__1) OR (`t`.`Subject` = ?p__2)) AS T ORDER BY `Id` ASC LIMIT 3 OFFSET 3;", builder.Sql);
Assert.AreEqual(@"SELECT COUNT(*) AS `TOTAL` FROM (SELECT * FROM `student` AS `t` WHERE `t`.`Score` IS NOT NULL AND (`t`.`Name` = ?p__1) OR (`t`.`Subject` = ?p__2)) AS T;SELECT * FROM `student` AS `t` WHERE `t`.`Score` IS NOT NULL AND (`t`.`Name` = ?p__1) OR (`t`.`Subject` = ?p__2) ORDER BY `Id` ASC LIMIT 3 OFFSET 3;", builder.Sql);
Assert.AreEqual(2, builder.Parameters.Count);
}

Expand Down
70 changes: 44 additions & 26 deletions SQLBuilder.Core/Entry/SqlBuilderCore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4547,23 +4547,24 @@ public SqlBuilderCore<T> OrderByDescending(Expression<Func<T, object>> expressio
/// <param name="sql">自定义sql语句</param>
/// <param name="parameters">自定义sql格式化参数</param>
/// <param name="countSyntax">分页计数语法，默认COUNT(*)</param>
/// <param name="sqlserverVersionGt10">sqlserver版本是否大于10，10版本以上采用ROWS FETCH NEXT最新语法</param>
/// <param name="serverVersion">DbConnection的ServerVersion属性</param>
/// <returns>SqlBuilderCore</returns>
public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, string sql = null, Dictionary<string, object> parameters = null, string countSyntax = "COUNT(*)", bool sqlserverVersionGt10 = false)
public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, string sql = null, Dictionary<string, object> parameters = null, string countSyntax = "COUNT(*)", string serverVersion = null)
{
var sb = new StringBuilder();

//排序字段
var order = string.Empty;
if (orderField.IsNotNullOrEmpty())
{
if (orderField.Contains(@"(/\*(?:|)*?\*/)|(\b(ASC|DESC)\b)", RegexOptions.IgnoreCase))
orderField = $"ORDER BY {orderField}";
order = $"ORDER BY {orderField}";
else
orderField = $"ORDER BY {orderField} ASC";
order = $"ORDER BY {orderField} ASC";
}
else if (this.sqlWrapper.DatabaseType == DatabaseType.SqlServer)
{
orderField = "ORDER BY (SELECT 0)";
order = "ORDER BY (SELECT 0)";
}

if (sql.IsNotNullOrEmpty())
Expand All @@ -4575,37 +4576,45 @@ public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, st

sql = sql.IsNullOrEmpty() ? this.sqlWrapper.ToString().TrimEnd(';') : sql.TrimEnd(';');

//数据库版本
var dbVersion = 0;
if (serverVersion.IsNotNullOrEmpty())
dbVersion = int.Parse(serverVersion.Split('.')[0]);

//SQLServer
if (this.sqlWrapper.DatabaseType == DatabaseType.SqlServer)
{
if (sqlserverVersionGt10)
sb.Append($"SELECT {countSyntax} AS [TOTAL] FROM ({sql}) AS T;SELECT * FROM ({sql}) AS T {orderField} OFFSET {((pageIndex - 1) * pageSize)} ROWS FETCH NEXT {pageSize} ROWS ONLY;");
if (dbVersion > 10)
sb.Append($"SELECT {countSyntax} AS [TOTAL] FROM ({sql}) AS T;{sql} {(orderField.IsNotNullOrEmpty() ? order : "")} OFFSET {(pageIndex - 1) * pageSize} ROWS FETCH NEXT {pageSize} ROWS ONLY;");
else
sb.Append($"SELECT {countSyntax} AS [TOTAL] FROM ({sql}) AS T;SELECT * FROM (SELECT ROW_NUMBER() OVER ({orderField}) AS [ROWNUMBER], * FROM ({sql}) AS T) AS N WHERE [ROWNUMBER] BETWEEN {((pageIndex - 1) * pageSize + 1)} AND {(pageIndex * pageSize)};");
sb.Append($"SELECT {countSyntax} AS [TOTAL] FROM ({sql}) AS T;SELECT * FROM (SELECT ROW_NUMBER() OVER ({order}) AS [ROWNUMBER], * FROM ({sql}) AS T) AS N WHERE [ROWNUMBER] BETWEEN {(pageIndex - 1) * pageSize + 1} AND {pageIndex * pageSize};");
}

//Oracle，注意Oracle需要分开查询总条数和分页数据
//Oracle，注意Oracle需要分开查询总条数和分页数据，此方法仅包含分页语句
if (this.sqlWrapper.DatabaseType == DatabaseType.Oracle)
{
sb.Append($"SELECT * FROM (SELECT X.*,ROWNUM AS \"ROWNUMBER\" FROM ({sql} ORDER BY {orderField}) X WHERE ROWNUM <= {pageSize * pageIndex}) T WHERE \"ROWNUMBER\" >= {pageSize * (pageIndex - 1) + 1}");
if (dbVersion > 11)
sb.Append($"{sql} {order} OFFSET {pageSize * (pageIndex - 1)} ROWS FETCH NEXT {pageSize} ROWS ONLY");
else
sb.Append($"SELECT * FROM (SELECT X.*,ROWNUM AS \"ROWNUMBER\" FROM ({sql} {order}) X WHERE ROWNUM <= {pageSize * pageIndex}) T WHERE \"ROWNUMBER\" >= {pageSize * (pageIndex - 1) + 1}");
}

//MySQL，注意8.0版本才支持WITH语法
if (this.sqlWrapper.DatabaseType == DatabaseType.MySql)
{
sb.Append($"SELECT {countSyntax} AS `TOTAL` FROM ({sql}) AS T;SELECT * FROM ({sql}) AS T {orderField} LIMIT {pageSize} OFFSET {(pageSize * (pageIndex - 1))};");
sb.Append($"SELECT {countSyntax} AS `TOTAL` FROM ({sql}) AS T;{sql} {order} LIMIT {pageSize} OFFSET {pageSize * (pageIndex - 1)};");
}

//PostgreSQL
if (this.sqlWrapper.DatabaseType == DatabaseType.PostgreSql)
{
sb.Append($"SELECT {countSyntax} AS \"TOTAL\" FROM ({sql}) AS T;SELECT * FROM ({sql}) AS T {orderField} LIMIT {pageSize} OFFSET {(pageSize * (pageIndex - 1))};");
sb.Append($"SELECT {countSyntax} AS \"TOTAL\" FROM ({sql}) AS T;{sql} {order} LIMIT {pageSize} OFFSET {pageSize * (pageIndex - 1)};");
}

//SQLite
if (this.sqlWrapper.DatabaseType == DatabaseType.Sqlite)
{
sb.Append($"SELECT {countSyntax} AS \"TOTAL\" FROM ({sql}) AS T;SELECT * FROM ({sql}) AS T {orderField} LIMIT {pageSize} OFFSET {(pageSize * (pageIndex - 1))};");
sb.Append($"SELECT {countSyntax} AS \"TOTAL\" FROM ({sql}) AS T;{sql} {order} LIMIT {pageSize} OFFSET {pageSize * (pageIndex - 1)};");
}

this.sqlWrapper.Reset(sb);
Expand All @@ -4622,23 +4631,24 @@ public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, st
/// <param name="sql">自定义sql语句</param>
/// <param name="parameters">自定义sql格式化参数</param>
/// <param name="countSyntax">分页计数语法，默认COUNT(*)</param>
/// <param name="sqlserverVersionGt10">sqlserver版本是否大于10，10版本以上采用ROWS FETCH NEXT最新语法</param>
/// <param name="serverVersion">DbConnection的ServerVersion属性</param>
/// <returns>SqlBuilderCore</returns>
public SqlBuilderCore<T> PageByWith(int pageSize, int pageIndex, string orderField, string sql = null, Dictionary<string, object> parameters = null, string countSyntax = "COUNT(*)", bool sqlserverVersionGt10 = false)
public SqlBuilderCore<T> PageByWith(int pageSize, int pageIndex, string orderField, string sql = null, Dictionary<string, object> parameters = null, string countSyntax = "COUNT(*)", string serverVersion = null)
{
var sb = new StringBuilder();

//排序字段
var order = string.Empty;
if (orderField.IsNotNullOrEmpty())
{
if (orderField.Contains(@"(/\*(?:|)*?\*/)|(\b(ASC|DESC)\b)", RegexOptions.IgnoreCase))
orderField = $"ORDER BY {orderField}";
order = $"ORDER BY {orderField}";
else
orderField = $"ORDER BY {orderField} ASC";
order = $"ORDER BY {orderField} ASC";
}
else if (this.sqlWrapper.DatabaseType == DatabaseType.SqlServer)
{
orderField = "ORDER BY (SELECT 0)";
order = "ORDER BY (SELECT 0)";
}

if (sql.IsNotNullOrEmpty())
Expand All @@ -4650,41 +4660,49 @@ public SqlBuilderCore<T> PageByWith(int pageSize, int pageIndex, string orderFie

sql = sql.IsNullOrEmpty() ? this.sqlWrapper.ToString().TrimEnd(';') : sql.TrimEnd(';');

//数据库版本
var dbVersion = 0;
if (serverVersion.IsNotNullOrEmpty())
dbVersion = int.Parse(serverVersion.Split('.')[0]);

//SQLServer
if (this.sqlWrapper.DatabaseType == DatabaseType.SqlServer)
{
if (sqlserverVersionGt10)
if (dbVersion > 10)
{
sb.Append($"{sql} SELECT {countSyntax} AS [TOTAL] FROM T;{sql} SELECT * FROM T {orderField} OFFSET {((pageIndex - 1) * pageSize)} ROWS FETCH NEXT {pageSize} ROWS ONLY;");
sb.Append($"{sql} SELECT {countSyntax} AS [TOTAL] FROM T;{sql.Remove(sql.LastIndexOf(")"), 1)} {(orderField.IsNotNullOrEmpty() ? order : "")}) SELECT * FROM T OFFSET {(pageIndex - 1) * pageSize} ROWS FETCH NEXT {pageSize} ROWS ONLY;");
}
else
{
sb.Append($"{sql} SELECT {countSyntax} AS [TOTAL] FROM T;{sql},R AS (SELECT ROW_NUMBER() OVER ({orderField}) AS [ROWNUMBER], * FROM T) SELECT * FROM R WHERE [ROWNUMBER] BETWEEN {((pageIndex - 1) * pageSize + 1)} AND {(pageIndex * pageSize)};");
sb.Append($"{sql} SELECT {countSyntax} AS [TOTAL] FROM T;{sql},R AS (SELECT ROW_NUMBER() OVER ({order}) AS [ROWNUMBER], * FROM T) SELECT * FROM R WHERE [ROWNUMBER] BETWEEN {(pageIndex - 1) * pageSize + 1} AND {pageIndex * pageSize};");
}
}

//Oracle，注意Oracle需要分开查询总条数和分页数据
//Oracle，注意Oracle需要分开查询总条数和分页数据，此方法仅包含分页语句
if (this.sqlWrapper.DatabaseType == DatabaseType.Oracle)
{
sb.Append($"{sql},R AS (SELECT ROWNUM AS \"ROWNUMBER\",T.* FROM T WHERE ROWNUM <= {pageSize * pageIndex} ORDER BY {orderField}) SELECT * FROM R WHERE \"ROWNUMBER\">={pageSize * (pageIndex - 1) + 1}");
if (dbVersion > 11)
sb.Append($"{sql.Remove(sql.LastIndexOf(")"), 1)} {order}) SELECT * FROM T OFFSET {pageSize * (pageIndex - 1)} ROWS FETCH NEXT {pageSize} ROWS ONLY");
else
sb.Append($"{sql.Remove(sql.LastIndexOf(")"), 1)} {order}),R AS (SELECT ROWNUM AS \"ROWNUMBER\",T.* FROM T WHERE ROWNUM <= {pageSize * pageIndex}) SELECT * FROM R WHERE \"ROWNUMBER\">={pageSize * (pageIndex - 1) + 1}");
}

//MySQL，注意8.0版本才支持WITH语法
if (this.sqlWrapper.DatabaseType == DatabaseType.MySql)
{
sb.Append($"{sql} SELECT {countSyntax} AS `TOTAL` FROM T;{sql} SELECT * FROM T {orderField} LIMIT {pageSize} OFFSET {(pageSize * (pageIndex - 1))};");
sb.Append($"{sql} SELECT {countSyntax} AS `TOTAL` FROM T;{sql.Remove(sql.LastIndexOf(")"), 1)} {order}) SELECT * FROM T LIMIT {pageSize} OFFSET {pageSize * (pageIndex - 1)};");
}

//PostgreSQL
if (this.sqlWrapper.DatabaseType == DatabaseType.PostgreSql)
{
sb.Append($"{sql} SELECT {countSyntax} AS \"TOTAL\" FROM T;{sql} SELECT * FROM T {orderField} LIMIT {pageSize} OFFSET {(pageSize * (pageIndex - 1))};");
sb.Append($"{sql} SELECT {countSyntax} AS \"TOTAL\" FROM T;{sql.Remove(sql.LastIndexOf(")"), 1)} {order}) SELECT * FROM T LIMIT {pageSize} OFFSET {pageSize * (pageIndex - 1)};");
}

//SQLite
if (this.sqlWrapper.DatabaseType == DatabaseType.Sqlite)
{
sb.Append($"{sql} SELECT {countSyntax} AS \"TOTAL\" FROM T;{sql} SELECT * FROM T {orderField} LIMIT {pageSize} OFFSET {(pageSize * (pageIndex - 1))};");
sb.Append($"{sql} SELECT {countSyntax} AS \"TOTAL\" FROM T;{sql.Remove(sql.LastIndexOf(")"), 1)} {order}) SELECT * FROM T LIMIT {pageSize} OFFSET {pageSize * (pageIndex - 1)};");
}

this.sqlWrapper.Reset(sb);
Expand Down

0 comments on commit 4c06bfd

Please sign in to comment.