tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 IncludeMany 变异 Where + ToList dto 无法级联；

Browse Source
This commit is contained in:
2881099
2023-10-19 15:36:48 +08:00
parent 801ba148d6
commit c8bdd5e741
4 changed files with 28 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace FreeSql.Internal.CommonProvider
#else
public List<Func<object, CancellationToken, Task>> _includeToListAsync = new List<Func<object, CancellationToken, Task>>();
#endif
public Dictionary<string, MemberExpression[]> _includeInfo = new Dictionary<string, MemberExpression[]>();
public Dictionary<string, NativeTuple<MemberExpression[], TableRef>> _includeInfo = new Dictionary<string, NativeTuple<MemberExpression[], TableRef>>();
public bool _distinct;
public Expression _selectExpression;
public List<GlobalFilter.Item> _whereGlobalFilter;

39
FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
View File

@ -287,6 +287,7 @@ namespace FreeSql.Internal.CommonProvider
public Dictionary<string, IncludeManyNewInit> Childs { get; } = new Dictionary<string, IncludeManyNewInit>();
public Expression CurrentExpression { get; }
public bool IsOutputPrimary { get; set; }
public List<ColumnInfo> OutputColumns { get; } = new List<ColumnInfo>();
public IncludeManyNewInit(TableInfo table, Expression currentExpression)
{
this.Table = table;
@ -313,20 +314,26 @@ namespace FreeSql.Internal.CommonProvider
{
var curIncNewInit = incNewInit;
Expression curParmExp = parmExp;
for (var a = 0; a < inc.Value.Length - 1; a++)
for (var a = 0; a < inc.Value.Item1.Length - 1; a++)
{
curParmExp = Expression.MakeMemberAccess(parmExp, inc.Value[a].Member);
if (curIncNewInit.Childs.ContainsKey(inc.Value[a].Member.Name) == false)
curIncNewInit.Childs.Add(inc.Value[a].Member.Name, curIncNewInit = new IncludeManyNewInit(_orm.CodeFirst.GetTableByEntity(inc.Value[a].Type), curParmExp));
curParmExp = Expression.MakeMemberAccess(parmExp, inc.Value.Item1[a].Member);
if (curIncNewInit.Childs.ContainsKey(inc.Value.Item1[a].Member.Name) == false)
curIncNewInit.Childs.Add(inc.Value.Item1[a].Member.Name, curIncNewInit = new IncludeManyNewInit(_orm.CodeFirst.GetTableByEntity(inc.Value.Item1[a].Type), curParmExp));
else
curIncNewInit = curIncNewInit.Childs[inc.Value[a].Member.Name];
curIncNewInit = curIncNewInit.Childs[inc.Value.Item1[a].Member.Name];
}
curIncNewInit.IsOutputPrimary = true;
var outcols = inc.Value.Item2.Columns.Where(a => a.Attribute.IsPrimary == false).ToArray();
if (outcols.Any()) curIncNewInit.OutputColumns.AddRange(outcols);
}
MemberInitExpression GetIncludeManyNewInitExpression(IncludeManyNewInit imni)
{
var bindings = new List<MemberBinding>();
if (imni.IsOutputPrimary) bindings.AddRange(imni.Table.Primarys.Select(a => Expression.Bind(imni.Table.Properties[a.CsName], Expression.MakeMemberAccess(imni.CurrentExpression, imni.Table.Properties[a.CsName]))));
if (imni.IsOutputPrimary)
{
bindings.AddRange(imni.Table.Primarys.Select(a => Expression.Bind(imni.Table.Properties[a.CsName], Expression.MakeMemberAccess(imni.CurrentExpression, imni.Table.Properties[a.CsName]))));
if (imni.OutputColumns.Any()) bindings.AddRange(imni.OutputColumns.Select(a => Expression.Bind(imni.Table.Properties[a.CsName], Expression.MakeMemberAccess(imni.CurrentExpression, imni.Table.Properties[a.CsName]))));
}
if (imni.Childs.Any()) bindings.AddRange(imni.Childs.Select(a => Expression.Bind(imni.Table.Properties[a.Key], GetIncludeManyNewInitExpression(a.Value))));
var pgarrayToManys = imni.Table.GetAllTableRef().Select(tr =>
{
@ -1514,7 +1521,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < members.Count; a++) includeValue[a] = members[a];
includeValue[includeValue.Length - 1] = expBody as MemberExpression;
var includeKey = $"{string.Join(".", includeValue.Select(a => a.Member.Name))}";
if (_includeInfo.ContainsKey(includeKey) == false) _includeInfo.Add(includeKey, includeValue);
if (_includeInfo.ContainsKey(includeKey) == false) _includeInfo.Add(includeKey, NativeTuple.Create(includeValue, tbref));
return this;
}
@ -1577,20 +1584,26 @@ namespace FreeSql.Internal.CommonProvider
{
var curIncNewInit = incNewInit;
Expression curParmExp = parmExp;
for (var a = 0; a < inc.Value.Length - 1; a++)
for (var a = 0; a < inc.Value.Item1.Length - 1; a++)
{
curParmExp = Expression.MakeMemberAccess(parmExp, inc.Value[a].Member);
if (curIncNewInit.Childs.ContainsKey(inc.Value[a].Member.Name) == false)
curIncNewInit.Childs.Add(inc.Value[a].Member.Name, curIncNewInit = new IncludeManyNewInit(_orm.CodeFirst.GetTableByEntity(inc.Value[a].Type), curParmExp));
curParmExp = Expression.MakeMemberAccess(parmExp, inc.Value.Item1[a].Member);
if (curIncNewInit.Childs.ContainsKey(inc.Value.Item1[a].Member.Name) == false)
curIncNewInit.Childs.Add(inc.Value.Item1[a].Member.Name, curIncNewInit = new IncludeManyNewInit(_orm.CodeFirst.GetTableByEntity(inc.Value.Item1[a].Type), curParmExp));
else
curIncNewInit = curIncNewInit.Childs[inc.Value[a].Member.Name];
curIncNewInit = curIncNewInit.Childs[inc.Value.Item1[a].Member.Name];
}
curIncNewInit.IsOutputPrimary = true;
var outcols = inc.Value.Item2.Columns.Where(a => a.Attribute.IsPrimary == false).ToArray();
if (outcols.Any()) curIncNewInit.OutputColumns.AddRange(outcols);
}
MemberInitExpression GetIncludeManyNewInitExpression(IncludeManyNewInit imni)
{
var bindings = new List<MemberBinding>();
if (imni.IsOutputPrimary) bindings.AddRange(imni.Table.Primarys.Select(a => Expression.Bind(imni.Table.Properties[a.CsName], Expression.MakeMemberAccess(imni.CurrentExpression, imni.Table.Properties[a.CsName]))));
if (imni.IsOutputPrimary)
{
bindings.AddRange(imni.Table.Primarys.Select(a => Expression.Bind(imni.Table.Properties[a.CsName], Expression.MakeMemberAccess(imni.CurrentExpression, imni.Table.Properties[a.CsName]))));
if (imni.OutputColumns.Any()) bindings.AddRange(imni.OutputColumns.Select(a => Expression.Bind(imni.Table.Properties[a.CsName], Expression.MakeMemberAccess(imni.CurrentExpression, imni.Table.Properties[a.CsName]))));
}
if (imni.Childs.Any()) bindings.AddRange(imni.Childs.Select(a => Expression.Bind(imni.Table.Properties[a.Key], GetIncludeManyNewInitExpression(a.Value))));
var pgarrayToManys = imni.Table.GetAllTableRef().Select(tr =>
{