From 6826dec09f75a25cbc72bda4b94447453706174a Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Fri, 17 Dec 2021 18:51:58 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20AsTreeCte=20+=20Reread?=
=?UTF-8?q?Sql=20=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E7=9A=84=20bug=EF=BC=9B#964?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql/Extensions/FreeSqlGlobalExtensions.cs | 4 +-
FreeSql/FreeSql.xml | 183 ++++++++++++++++++
.../SelectProvider/Select0ProviderReader.cs | 10 +-
3 files changed, 191 insertions(+), 6 deletions(-)
diff --git a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
index fcd18baf..b306b417 100644
--- a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
+++ b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
@@ -520,11 +520,11 @@ JOIN {select._commonUtils.QuoteSqlName(tb.DbName)} a ON cte_tbc.cte_id = a.{sele
}
sql1ctePath = $"{sql1ctePath} as cte_path, ";
}
- var sql1 = select.ToSql($"0 as cte_level, {sql1ctePath}{select.GetAllFieldExpressionTreeLevel2().Field}").Trim();
+ var sql1 = select.ToSql($"0 as cte_level, {sql1ctePath}{select.GetAllFieldExpressionTreeLevel2(false).Field}").Trim();
select._where.Clear();
select.As("wct2");
- var sql2Field = select.GetAllFieldExpressionTreeLevel2().Field;
+ var sql2Field = select.GetAllFieldExpressionTreeLevel2(false).Field;
var sql2InnerJoinOn = up == false ?
string.Join(" and ", tbref.Columns.Select((a, z) => $"wct2.{select._commonUtils.QuoteSqlName(tbref.RefColumns[z].Attribute.Name)} = wct1.{select._commonUtils.QuoteSqlName(a.Attribute.Name)}")) :
string.Join(" and ", tbref.Columns.Select((a, z) => $"wct2.{select._commonUtils.QuoteSqlName(a.Attribute.Name)} = wct1.{select._commonUtils.QuoteSqlName(tbref.RefColumns[z].Attribute.Name)}"));
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index ab20a387..4caa4edf 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -3196,6 +3196,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>
+
+
+
+
+
+
+
+
可自定义解析表达式
@@ -4090,6 +4261,12 @@
超时
+
+
+ 获取资源
+
+
+
使用完毕后，归还资源
@@ -4160,6 +4337,12 @@
资源对象
+
+
+ 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
+
+ 资源对象
+
归还对象给对象池的时候触发
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
index c3352756..89f4ea05 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
@@ -533,7 +533,7 @@ namespace FreeSql.Internal.CommonProvider
});
}
static EventHandler _OldAuditDataReaderHandler;
- public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2()
+ public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2(bool isRereadSql = true)
{
if (_selectExpression != null) //ToSql
{
@@ -549,7 +549,7 @@ namespace FreeSql.Internal.CommonProvider
_OldAuditDataReaderHandler = _orm.Aop.AuditDataReaderHandler; //清除单表 ExppressionTree
_dicGetAllFieldExpressionTree.TryRemove($"{_orm.Ado.DataType}-{_tables[0].Table.DbName}-{_tables[0].Table.CsName}-{_tables[0].Alias}-{_tables[0].Type}", out var oldet);
}
- return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Table.CsName}-{a.Alias}-{a.Type}")), s =>
+ return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Table.CsName}-{a.Alias}-{a.Type}-{(isRereadSql ? 1 : 0)}")), s =>
{
var tb1 = _tables.First().Table;
var type = tb1.TypeLazy ?? tb1.Type;
@@ -583,7 +583,8 @@ namespace FreeSql.Internal.CommonProvider
{ //普通字段
if (index > 0) field.Append(", ");
var quoteName = _commonUtils.QuoteSqlName(col.Attribute.Name);
- field.Append(_commonUtils.RereadColumn(col, $"{tb.Alias}.{quoteName}"));
+ if (isRereadSql) field.Append(_commonUtils.RereadColumn(col, $"{tb.Alias}.{quoteName}"));
+ else field.Append($"{tb.Alias}.{quoteName}");
++index;
if (dicfield.ContainsKey(quoteName)) field.Append(_commonUtils.FieldAsAlias($"as{index}"));
else dicfield.Add(quoteName, true);
@@ -606,7 +607,8 @@ namespace FreeSql.Internal.CommonProvider
{
if (index > 0) field.Append(", ");
var quoteName = _commonUtils.QuoteSqlName(col2.Attribute.Name);
- field.Append(_commonUtils.RereadColumn(col2, $"{tb2.Alias}.{quoteName}"));
+ if (isRereadSql) field.Append(_commonUtils.RereadColumn(col2, $"{tb2.Alias}.{quoteName}"));
+ else field.Append($"{tb2.Alias}.{quoteName}");
++index;
++otherindex;
if (dicfield.ContainsKey(quoteName)) field.Append(_commonUtils.FieldAsAlias($"as{index}"));