tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 增加 ISelectGrouping 分组查询总量的方法 .Count()；

Browse Source
This commit is contained in:
28810 2019-12-21 20:00:39 +08:00
parent 01c0fbf4f2
commit f5128f3308
16 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlSelectTest.cs
View File

@ -722,6 +722,7 @@ namespace FreeSql.Tests.MySqlConnector
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/Curd/DamengSelectTest.cs
View File

@ -648,6 +648,7 @@ namespace FreeSql.Tests.Odbc.Dameng
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/Curd/OdbcSelectTest.cs
View File

@ -639,6 +639,7 @@ namespace FreeSql.Tests.Odbc.Default
.OrderBy(a => a.Key.tt2)
.OrderByDescending(a => a.Count())
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlSelectTest.cs
View File

@ -732,6 +732,7 @@ namespace FreeSql.Tests.Odbc.MySql
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/Curd/OracleSelectTest.cs
View File

@ -648,6 +648,7 @@ namespace FreeSql.Tests.Odbc.Oracle
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/Curd/PostgreSQLSelectTest.cs
View File

@ -710,6 +710,7 @@ namespace FreeSql.Tests.Odbc.PostgreSQL
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/Curd/SqlServerSelectTest.cs
View File

@ -604,6 +604,7 @@ namespace FreeSql.Tests.Odbc.SqlServer
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlSelectTest.cs
View File

@ -763,6 +763,7 @@ namespace FreeSql.Tests.MySql
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleSelectTest.cs
View File

@ -648,6 +648,7 @@ namespace FreeSql.Tests.Oracle
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs
View File

@ -727,6 +727,7 @@ namespace FreeSql.Tests.PostgreSQL
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs
View File

@ -652,6 +652,7 @@ namespace FreeSql.Tests.SqlServer
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

1
FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
View File

@ -601,6 +601,7 @@ namespace FreeSql.Tests.Sqlite
.OrderByDescending(a => a.Count())
.Offset(10)
.Limit(2)
.Count(out var trycount)
.ToList(a => new
{
a.Key.tt2,

13
FreeSql/FreeSql.xml
View File

@ -1776,6 +1776,19 @@
<param name="pageSize">每页多少</param>
<returns></returns>
</member>
<member name="M:FreeSql.ISelectGrouping`2.Count">
<summary>
查询的记录数量
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.ISelectGrouping`2.Count(System.Int64@)">
<summary>
查询的记录数量，以参数out形式返回
</summary>
<param name="count">返回的变量</param>
<returns></returns>
</member>
<member name="P:FreeSql.ISelectGroupingAggregate`1.Key">
<summary>
分组的数据

13
FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs
View File

@ -11,6 +11,7 @@ namespace FreeSql
#if net40
#else
Task<long> CountAsync();
Task<List<TReturn>> ToListAsync<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select);
#endif
@ -95,6 +96,18 @@ namespace FreeSql
/// <param name="pageSize">每页多少</param>
/// <returns></returns>
ISelectGrouping<TKey, TValue> Page(int pageNumber, int pageSize);
/// <summary>
/// 查询的记录数量
/// </summary>
/// <returns></returns>
long Count();
/// <summary>
/// 查询的记录数量，以参数out形式返回
/// </summary>
/// <param name="count">返回的变量</param>
/// <returns></returns>
ISelectGrouping<TKey, TValue> Count(out long count);
}
public interface ISelectGroupingAggregate<TKey>

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

@ -1052,7 +1052,7 @@ namespace FreeSql.Internal.CommonProvider
_commonExpression.ReadAnonymousField(_tables, field, map, ref index, columns, null, _whereCascadeExpression, true);
this.GroupBy(field.Length > 0 ? field.Remove(0, 2).ToString() : null);
return new SelectGroupingProvider<TKey, TValue>(this, map, _commonExpression, _tables);
return new SelectGroupingProvider<TKey, TValue>(_orm, this, map, _commonExpression, _tables);
}
protected TSelect InternalJoin(Expression exp, SelectTableInfoType joinType)
{

14
FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
View File

@ -11,13 +11,14 @@ namespace FreeSql.Internal.CommonProvider
{
public class SelectGroupingProvider<TKey, TValue> : ISelectGrouping<TKey, TValue>
{
internal IFreeSql _orm;
internal object _select;
internal ReadAnonymousTypeInfo _map;
internal CommonExpression _comonExp;
internal List<SelectTableInfo> _tables;
public SelectGroupingProvider(object select, ReadAnonymousTypeInfo map, CommonExpression comonExp, List<SelectTableInfo> tables)
public SelectGroupingProvider(IFreeSql orm, object select, ReadAnonymousTypeInfo map, CommonExpression comonExp, List<SelectTableInfo> tables)
{
_orm = orm;
_select = select;
_map = map;
_comonExp = comonExp;
@ -162,8 +163,17 @@ namespace FreeSql.Internal.CommonProvider
return this;
}
public long Count() => long.TryParse(string.Concat(_orm.Ado.ExecuteScalar($"select count(1) from ({this.ToSql("1 as1")}) fta")), out var trylng) ? trylng : default(long);
public ISelectGrouping<TKey, TValue> Count(out long count)
{
count = this.Count();
return this;
}
#if net40
#else
async public Task<long> CountAsync() => long.TryParse(string.Concat(await _orm.Ado.ExecuteScalarAsync($"select count(1) from ({this.ToSql("1 as1")}) fta")), out var trylng) ? trylng : default(long);
public Task<List<TReturn>> ToListAsync<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select)
{
var map = new ReadAnonymousTypeInfo();