From c5cd2e72ebbdeab202d0f0f9e441ed353abbd0fc Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Sat, 19 Apr 2025 16:54:19 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=20SqlExt=20=E8=81=9A?=
=?UTF-8?q?=E5=90=88=E5=87=BD=E6=95=B0=20Count=20=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=20int=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FreeSqlGlobalExpressionCallExtensions.cs | 10 +++----
FreeSql/FreeSql.xml | 27 ++++++++++++++++++-
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
index a7ac772ed..293fbf64a 100644
--- a/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
+++ b/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
@@ -222,17 +222,17 @@ namespace FreeSql
/// rank() over(order by ...)
///
///
- public static ISqlOver Rank() => Over("rank()");
+ public static ISqlOver Rank() => Over("rank()");
///
/// dense_rank() over(order by ...)
///
///
- public static ISqlOver DenseRank() => Over("dense_rank()");
+ public static ISqlOver DenseRank() => Over("dense_rank()");
///
/// count() over(order by ...)
///
///
- public static ISqlOver Count(object column) => Over($"count({expContext.Value.ParsedContent["column"]})");
+ public static ISqlOver Count(object column) => Over($"count({expContext.Value.ParsedContent["column"]})");
///
/// sum(..) over(order by ...)
///
@@ -262,7 +262,7 @@ namespace FreeSql
/// SqlServer row_number() over(order by ...)
///
///
- public static ISqlOver RowNumber() => Over("row_number()");
+ public static ISqlOver RowNumber() => Over("row_number()");
#endregion
///
@@ -284,7 +284,7 @@ namespace FreeSql
///
///
///
- public static long DistinctCount(T column)
+ public static int DistinctCount(T column)
{
expContext.Value.Result = $"count(distinct {expContext.Value.ParsedContent["column"]})";
return 0;
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 8612f2a7f..3a9fdc72b 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -583,6 +583,16 @@
最大长度
+
+
+ 暂支持 SqlServer/MySql(其他数据库待补充)
+
+
+
+
+ 暂支持 SqlServer/MySql(其他数据库待补充)
+
+
主键
@@ -4415,7 +4425,7 @@
获取指定数据库的表信息,包括表、列详情、主键、唯一键、索引、外键、备注
-
+ 可选-默认查询当前数据库
@@ -6077,6 +6087,21 @@
+
+
+ 克隆 ISelect
+
+
+
+
+ 克隆 ISelect
+
+
+
+
+ 克隆 ISelect
+
+
本方法实现从已知的内存 List 数据,进行和 ISelect.IncludeMany 相同功能的贪婪加载