diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 469e9eb0f..052eb18a9 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -3347,6 +3347,13 @@
+
+
+ 执行SQL语句，返回更新后的记录
+ 注意：此方法只有 Postgresql/SqlServer 有效果
+
+
+
指定事务对象
@@ -3691,6 +3698,177 @@
+
+
+ 测试数据库是否连接正确，本方法执行如下命令：
+ MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1
+ Oracle: SELECT 1 FROM dual
+
+ 命令超时设置(秒)
+
+ true: 成功, false: 失败
+
+
+
+ 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
+
+
+
+
+
+
+
+
+
+ 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+ 在【主库】执行
+
+
+
+
+
+
+
+
+ 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+ 在【主库】执行
+
+
+
+
+
+
+
+
+ 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+ 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
+
+
+
+
+
+
+
+
+
+
+ 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > @age", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
+
+ 执行SQL返回对象集合，Query<User>("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
+
+
+
+
+
+
+
+
+
+
+
+ 执行SQL返回对象集合，Query<User, Address>("select * from user where age > @age; select * from address", new { age = 25 })
+ 提示：parms 参数还可以传 Dictionary<string, object>
+
+
+
+
+
+
+
+
可自定义解析表达式
@@ -4690,6 +4868,12 @@
超时
+
+
+ 获取资源
+
+
+
使用完毕后，归还资源
@@ -4765,6 +4949,12 @@
资源对象
+
+
+ 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
+
+ 资源对象
+
归还对象给对象池的时候触发
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
index 6c3fd8c8d..27ec522d5 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -1032,6 +1032,7 @@ namespace FreeSql.Internal.CommonProvider
public TSelect WhereIf(bool condition, string sql, object parms = null)
{
if (condition == false || string.IsNullOrEmpty(sql)) return this as TSelect;
+ if (_groupBySelfFlag) return this.Having(sql, parms);
_where.Append(" AND (").Append(sql).Append(")");
if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
return this as TSelect;
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
index 227693876..f6cc6b50e 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
@@ -851,8 +851,10 @@ namespace FreeSql.Internal.CommonProvider
this.GroupBy(sql.Length > 0 ? sql.Substring(2) : null);
return new SelectGroupingProvider(_orm, this, map, sql, _commonExpression, _tables);
}
+ bool _groupBySelfFlag = false;
public TSelect InternalGroupBySelf(Expression column)
{
+ _groupBySelfFlag = true;
if (column.NodeType == ExpressionType.Lambda) column = (column as LambdaExpression)?.Body;
switch (column?.NodeType)
{