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

- 修复 v3.2.204 带的的 ToList 子查询 bug；c6fec6acd4

Browse Source
This commit is contained in:
2881099
2025-05-14 21:52:37 +08:00
parent f27123e32f
commit 10de974a70
4 changed files with 35 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Examples/base_entity/Program.cs
View File

@@ -616,24 +616,11 @@ namespace base_entity
//if (cmd.CommandText.StartsWith("")) //if (cmd.CommandText.StartsWith(""))
}) })
.UseLazyLoading(true) .UseLazyLoading(true)
//.UseGenerateCommandParameterWithLambda(true) .UseGenerateCommandParameterWithLambda(true)
.Build(); .Build();
BaseEntity.Initialization(fsql, () => _asyncUow.Value); BaseEntity.Initialization(fsql, () => _asyncUow.Value);
#endregion #endregion
fsql.Select<User1>().WithTempQuery(a => new { a.Nickname, a.Username }).ToChunk(10, e =>
{
foreach (var item in e.Object)
Console.WriteLine(item.Nickname);
});
Task.Run(async () =>
{
await foreach (var xxs1 in fsql.Select<User1>().WithTempQuery(a => new { a.Nickname, a.Username }).ToChunkAsyncEnumerable(10))
{
foreach (var item in xxs1)
Console.WriteLine(item.Nickname);
}
}).Wait();
var usergroupRepository = fsql.GetAggregateRootRepository<UserGroup>(); var usergroupRepository = fsql.GetAggregateRootRepository<UserGroup>();
usergroupRepository.Delete(a => true); usergroupRepository.Delete(a => true);
@@ -669,7 +656,6 @@ namespace base_entity
ugroupFirst.Sort++; ugroupFirst.Sort++;
usergroupRepository.Update(ugroupFirst); usergroupRepository.Update(ugroupFirst);
var userRepository = fsql.GetAggregateRootRepository<User1>(); var userRepository = fsql.GetAggregateRootRepository<User1>();
var testsublist1 = fsql.Select<UserGroup>() var testsublist1 = fsql.Select<UserGroup>()
.ToList(a => new .ToList(a => new
{ {
@@ -677,6 +663,29 @@ namespace base_entity
list = userRepository.Select.Where(b => a.Id == 1).Where(b => b.GroupId == a.Id).ToList(), list = userRepository.Select.Where(b => a.Id == 1).Where(b => b.GroupId == a.Id).ToList(),
list2 = fsql.Select<User1>().Where(b => a.Id == 2).Where(b => b.GroupId == a.Id).ToList(b => b.Nickname), list2 = fsql.Select<User1>().Where(b => a.Id == 2).Where(b => b.GroupId == a.Id).ToList(b => b.Nickname),
}); });
var testsublist2 = fsql.Select<UserGroup, User1>()
.ToList(a => new
{
a.t1.Id,
list = userRepository.Select.Where(b => a.t1.Id == 1).Where(b => b.GroupId == a.t1.Id).ToList(),
list2 = fsql.Select<User1, UserGroup>().Where(b => a.t1.Id == 2).Where(b => b.t1.GroupId == a.t1.Id).ToList(b => b.t1.Nickname),
});
fsql.Select<User1>().WithTempQuery(a => new { a.Nickname, a.Username }).ToChunk(10, e =>
{
foreach (var item in e.Object)
Console.WriteLine(item.Nickname);
});
Task.Run(async () =>
{
await foreach (var xxs1 in fsql.Select<User1>().WithTempQuery(a => new { a.Nickname, a.Username }).ToChunkAsyncEnumerable(10))
{
foreach (var item in xxs1)
Console.WriteLine(item.Nickname);
}
}).Wait();
Utils.IsStrict = false; Utils.IsStrict = false;
var user1Tb = fsql.CodeFirst.GetTableByEntity(typeof(User11)); var user1Tb = fsql.CodeFirst.GetTableByEntity(typeof(User11));
@@ -1770,7 +1779,7 @@ var sql11111 = fsql.Select<Class1111>()
Math.PI Math.PI
}); });
var testsublist2 = fsql.Select<UserGroup>() var testsublist21 = fsql.Select<UserGroup>()
.GroupBy(a => new { a.Id }) .GroupBy(a => new { a.Id })
.WithTempQuery(a => a.Key) .WithTempQuery(a => a.Key)
.First(a => new .First(a => new

8
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@@ -764,5 +764,13 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

111
FreeSql/FreeSql.xml
View File

@@ -1097,93 +1097,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
<summary>
动态创建实体类型
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
<summary>
配置Class
</summary>
<param name="className">类名</param>
<param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
<returns></returns>
</member>
<member name="P:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.TypeBuilder">
<summary>
获取类型构建器，可作为要构建的Type来引用
</summary>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="isOverride">该属性是否重写父类属性</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
<summary>
配置属性
</summary>
<param name="propertyName">属性名称</param>
<param name="propertyType">属性类型</param>
<param name="isOverride">该属性是否重写父类属性</param>
<param name="defaultValue">属性默认值</param>
<param name="attributes">属性标记的特性-支持多个</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
<summary>
配置父类
</summary>
<param name="superClass">父类类型</param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
<summary>
Override属性
</summary>
<param name="typeBuilder"></param>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
<summary>
Emit动态创建出Class - Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.BuildJustType">
<summary>
Emit动态创建出Class - Type，不附带获取TableInfo
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
<summary>
首字母小写
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
<summary>
首字母大写
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)"> <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
<summary> <summary>
获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 "" 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 ""
@@ -1563,7 +1476,7 @@
<param name="slaveConnectionString">从数据库连接串</param> <param name="slaveConnectionString">从数据库连接串</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.FreeSqlBuilder.UseConnectionFactory(FreeSql.DataType,System.Func{System.String,System.Data.Common.DbConnection},System.Type)"> <member name="M:FreeSql.FreeSqlBuilder.UseConnectionFactory(FreeSql.DataType,System.Func{System.Data.Common.DbConnection},System.Type)">
<summary> <summary>
使用自定义数据库连接对象（放弃内置对象连接池技术） 使用自定义数据库连接对象（放弃内置对象连接池技术）
</summary> </summary>
@@ -5984,28 +5897,6 @@
对象池 对象池
</summary> </summary>
</member> </member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
<summary>
动态构建Class Type
</summary>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
根据字典，创建 table 对应的实体对象
</summary>
<param name="table"></param>
<param name="dict"></param>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
<summary>
根据实体对象，创建 table 对应的字典
</summary>
<param name="table"></param>
<param name="instance"></param>
<returns></returns>
</member>
<member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)"> <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
<summary> <summary>
C#： that >= between &amp;&amp; that &lt;= and<para></para> C#： that >= between &amp;&amp; that &lt;= and<para></para>

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

@@ -426,7 +426,7 @@ namespace FreeSql.Internal.CommonProvider
return exp; return exp;
} }
callExp = callExpStack.Pop(); callExp = callExpStack.Pop();
Expression newExp = callExp.Object.NodeType == ExpressionType.MemberAccess && typeof(ISelect0).IsAssignableFrom(callExp.Object.Type) ? Expression newExp = callExp.Object != null && callExp.Object.NodeType == ExpressionType.MemberAccess && typeof(ISelect0).IsAssignableFrom(callExp.Object.Type) ?
new ReplaceMemberExpressionVisitor().Replace(callExp, callExp.Object, Expression.Convert(Expression.Call( new ReplaceMemberExpressionVisitor().Replace(callExp, callExp.Object, Expression.Convert(Expression.Call(
Expression.Convert(callExp.Object, typeof(Select0Provider)), Expression.Convert(callExp.Object, typeof(Select0Provider)),
typeof(Select0Provider).GetMethod(nameof(SetSameSelectPendingShareData), BindingFlags.NonPublic | BindingFlags.Instance), typeof(Select0Provider).GetMethod(nameof(SetSameSelectPendingShareData), BindingFlags.NonPublic | BindingFlags.Instance),