tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 17:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 分页 Page(..).Count() 顺序问题；

Browse Source
This commit is contained in:
2881099
2020-11-23 16:23:42 +08:00
parent 3b9b10fd2f
commit d2d3870de0
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@@ -696,7 +696,11 @@ namespace FreeSql.Internal.CommonProvider
public long Count() public long Count()
{ {
var tmpOrderBy = _orderby; var tmpOrderBy = _orderby;
var tmpSkip = _skip;
var tmpLimit = _limit;
_orderby = null; //解决 select count(1) from t order by id 这样的 SQL 错误 _orderby = null; //解决 select count(1) from t order by id 这样的 SQL 错误
_skip = 0;
_limit = 0;
try try
{ {
return this.ToList<int>($"count(1){_commonUtils.FieldAsAlias("as1")}").Sum(); //这里的 Sum 为了分表查询 return this.ToList<int>($"count(1){_commonUtils.FieldAsAlias("as1")}").Sum(); //这里的 Sum 为了分表查询
@@ -704,6 +708,8 @@ namespace FreeSql.Internal.CommonProvider
finally finally
{ {
_orderby = tmpOrderBy; _orderby = tmpOrderBy;
_skip = tmpSkip;
_limit = tmpLimit;
} }
} }
public TSelect Count(out long count) public TSelect Count(out long count)
@@ -733,7 +739,11 @@ namespace FreeSql.Internal.CommonProvider
async public Task<long> CountAsync(CancellationToken cancellationToken = default) async public Task<long> CountAsync(CancellationToken cancellationToken = default)
{ {
var tmpOrderBy = _orderby; var tmpOrderBy = _orderby;
var tmpSkip = _skip;
var tmpLimit = _limit;
_orderby = null; _orderby = null;
_skip = 0;
_limit = 0;
try try
{ {
return (await this.ToListAsync<int>($"count(1){_commonUtils.FieldAsAlias("as1")}", cancellationToken)).Sum(); //这里的 Sum 为了分表查询 return (await this.ToListAsync<int>($"count(1){_commonUtils.FieldAsAlias("as1")}", cancellationToken)).Sum(); //这里的 Sum 为了分表查询
@@ -741,6 +751,8 @@ namespace FreeSql.Internal.CommonProvider
finally finally
{ {
_orderby = tmpOrderBy; _orderby = tmpOrderBy;
_skip = tmpSkip;
_limit = tmpLimit;
} }
} }
public virtual Task<List<T1>> ToListAsync(bool includeNestedMembers = false, CancellationToken cancellationToken = default) public virtual Task<List<T1>> ToListAsync(bool includeNestedMembers = false, CancellationToken cancellationToken = default)