weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-24 09:10:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 调整 SqlExt 聚合函数 Count 统一返回 int；

Browse Source
This commit is contained in:
2881099
2025-04-19 16:54:19 +08:00
parent 0429964eb5
commit c5cd2e72eb
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
View File

@@ -222,17 +222,17 @@ namespace FreeSql
/// rank() over(order by ...) /// rank() over(order by ...)
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static ISqlOver<long> Rank() => Over<long>("rank()"); public static ISqlOver<int> Rank() => Over<int>("rank()");
/// <summary> /// <summary>
/// dense_rank() over(order by ...) /// dense_rank() over(order by ...)
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static ISqlOver<long> DenseRank() => Over<long>("dense_rank()"); public static ISqlOver<int> DenseRank() => Over<int>("dense_rank()");
/// <summary> /// <summary>
/// count() over(order by ...) /// count() over(order by ...)
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static ISqlOver<long> Count(object column) => Over<long>($"count({expContext.Value.ParsedContent["column"]})"); public static ISqlOver<int> Count(object column) => Over<int>($"count({expContext.Value.ParsedContent["column"]})");
/// <summary> /// <summary>
/// sum(..) over(order by ...) /// sum(..) over(order by ...)
/// </summary> /// </summary>
@@ -262,7 +262,7 @@ namespace FreeSql
/// SqlServer row_number() over(order by ...) /// SqlServer row_number() over(order by ...)
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static ISqlOver<long> RowNumber() => Over<long>("row_number()"); public static ISqlOver<int> RowNumber() => Over<int>("row_number()");
#endregion #endregion
/// <summary> /// <summary>
@@ -284,7 +284,7 @@ namespace FreeSql
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="column"></param> /// <param name="column"></param>
/// <returns></returns> /// <returns></returns>
public static long DistinctCount<T>(T column) public static int DistinctCount<T>(T column)
{ {
expContext.Value.Result = $"count(distinct {expContext.Value.ParsedContent["column"]})"; expContext.Value.Result = $"count(distinct {expContext.Value.ParsedContent["column"]})";
return 0; return 0;

27
FreeSql/FreeSql.xml
View File

@@ -583,6 +583,16 @@
最大长度 最大长度
</summary> </summary>
</member> </member>
<member name="P:FreeSql.DatabaseModel.DbColumnInfo.Precision">
<summary>
暂支持 SqlServer/MySql（其他数据库待补充）
</summary>
</member>
<member name="P:FreeSql.DatabaseModel.DbColumnInfo.Scale">
<summary>
暂支持 SqlServer/MySql（其他数据库待补充）
</summary>
</member>
<member name="P:FreeSql.DatabaseModel.DbColumnInfo.IsPrimary"> <member name="P:FreeSql.DatabaseModel.DbColumnInfo.IsPrimary">
<summary> <summary>
主键 主键
@@ -4415,7 +4425,7 @@
<summary> <summary>
获取指定数据库的表信息，包括表、列详情、主键、唯一键、索引、外键、备注 获取指定数据库的表信息，包括表、列详情、主键、唯一键、索引、外键、备注
</summary> </summary>
<param name="database"></param> <param name="database">可选-默认查询当前数据库</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.IDbFirst.GetTableByName(System.String,System.Boolean)"> <member name="M:FreeSql.IDbFirst.GetTableByName(System.String,System.Boolean)">
@@ -6077,6 +6087,21 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSqlGlobalExtensions.Clone``1(FreeSql.ISelect{``0})">
<summary>
克隆 ISelect
</summary>
</member>
<member name="M:FreeSqlGlobalExtensions.Clone``2(FreeSql.ISelect{``0,``1})">
<summary>
克隆 ISelect
</summary>
</member>
<member name="M:FreeSqlGlobalExtensions.Clone``3(FreeSql.ISelect{``0,``1,``2})">
<summary>
克隆 ISelect
</summary>
</member>
<member name="M:FreeSqlGlobalExtensions.IncludeMany``2(System.Collections.Generic.List{``0},IFreeSql,System.Linq.Expressions.Expression{System.Func{``0,System.Collections.Generic.IEnumerable{``1}}},System.Action{FreeSql.ISelect{``1}})"> <member name="M:FreeSqlGlobalExtensions.IncludeMany``2(System.Collections.Generic.List{``0},IFreeSql,System.Linq.Expressions.Expression{System.Func{``0,System.Collections.Generic.IEnumerable{``1}}},System.Action{FreeSql.ISelect{``1}})">
<summary> <summary>
本方法实现从已知的内存 List 数据，进行和 ISelect.IncludeMany 相同功能的贪婪加载<para></para> 本方法实现从已知的内存 List 数据，进行和 ISelect.IncludeMany 相同功能的贪婪加载<para></para>