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

- 优化 WithTempQuery 场景的 DTO 映射查询；

Browse Source
This commit is contained in:
2881099
2023-02-28 14:41:03 +08:00
parent 4a2f9eb77e
commit 24b5c265b9
6 changed files with 195 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
FreeSql/Internal/CommonExpression.cs
View File

@ -328,28 +328,32 @@ namespace FreeSql.Internal
{
if (dtTb.Table.ColumnsByCs.TryGetValue(dtoProp.Name, out var trydtocol) == false)
{
if (diymemexp != null && dtTb.Parameter != null && dtTb.Parameter.Type.GetPropertiesDictIgnoreCase().TryGetValue(dtoProp.Name, out var dtTbProp))
if (diymemexp != null && dtTb.Parameter != null)
{
var dbfield = diymemexp.ParseExp(new Expression[] { Expression.MakeMemberAccess(dtTb.Parameter, dtTbProp) });
if (diymemexp.ParseExpMapResult != null)
var dbTbExp = MatchDtoProperty(dtTb, dtoProp);
if (dbTbExp?.Any() == true)
{
var diychild = new ReadAnonymousTypeInfo
var dbfield = diymemexp.ParseExp(dbTbExp);
if (diymemexp.ParseExpMapResult != null)
{
Property = dtoProp,
CsName = dtoProp.Name,
CsType = dtTbProp.PropertyType,
MapType = dtTbProp.PropertyType
};
parent.Childs.Add(diychild);
diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}";
diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField;
field.Append(", ").Append(diychild.DbField);
if (index >= 0)
{
diychild.DbNestedField = $"as{++index}";
field.Append(_common.FieldAsAlias(diychild.DbNestedField));
var diychild = new ReadAnonymousTypeInfo
{
Property = dtoProp,
CsName = dtoProp.Name,
CsType = dbTbExp.LastOrDefault().Type,
MapType = dbTbExp.LastOrDefault().Type
};
parent.Childs.Add(diychild);
diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}";
diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField;
field.Append(", ").Append(diychild.DbField);
if (index >= 0)
{
diychild.DbNestedField = $"as{++index}";
field.Append(_common.FieldAsAlias(diychild.DbNestedField));
}
break;
}
break;
}
}
continue;
@ -450,28 +454,32 @@ namespace FreeSql.Internal
{
if (dtTb.Table.ColumnsByCs.TryGetValue(dtoProp.Name, out var trydtocol) == false)
{
if (diymemexp != null && dtTb.Parameter != null && dtTb.Parameter.Type.GetPropertiesDictIgnoreCase().TryGetValue(dtoProp.Name, out var dtTbProp))
if (diymemexp != null && dtTb.Parameter != null)
{
var dbfield = diymemexp.ParseExp(new Expression[] { Expression.MakeMemberAccess(dtTb.Parameter, dtTbProp) });
if (diymemexp.ParseExpMapResult != null)
var dbTbExp = MatchDtoProperty(dtTb, dtoProp);
if (dbTbExp?.Any() == true)
{
var diychild = new ReadAnonymousTypeInfo
var dbfield = diymemexp.ParseExp(dbTbExp);
if (diymemexp.ParseExpMapResult != null)
{
Property = dtoProp,
CsName = dtoProp.Name,
CsType = dtTbProp.PropertyType,
MapType = dtTbProp.PropertyType
};
parent.Childs.Add(diychild);
diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}";
diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField;
field.Append(", ").Append(diychild.DbField);
if (index >= 0)
{
diychild.DbNestedField = $"as{++index}";
field.Append(_common.FieldAsAlias(diychild.DbNestedField));
var diychild = new ReadAnonymousTypeInfo
{
Property = dtoProp,
CsName = dtoProp.Name,
CsType = dbTbExp.LastOrDefault().Type,
MapType = dbTbExp.LastOrDefault().Type
};
parent.Childs.Add(diychild);
diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}";
diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField;
field.Append(", ").Append(diychild.DbField);
if (index >= 0)
{
diychild.DbNestedField = $"as{++index}";
field.Append(_common.FieldAsAlias(diychild.DbNestedField));
}
break;
}
break;
}
}
continue;
@ -1723,7 +1731,7 @@ namespace FreeSql.Internal
expStack.Push(oper2Parm);
else if (oper2Parm.Type != typeof(object) && oper2Parm.Type.IsAssignableFrom(exp2.Type))
expStack.Push(oper2Parm);
else if (oper2Parm.Type == typeof(object) && tsc._tables[0].Table != null && exp2.Type.IsAssignableFrom(tsc._tables[0].Table.Type) == true)
else if (oper2Parm.Type == typeof(object) && tsc._tables != null && tsc._tables[0].Table != null && exp2.Type.IsAssignableFrom(tsc._tables[0].Table.Type) == true)
expStack.Push(oper2Parm);
else
expStack.Push(Expression.Parameter(exp2.Type, oper2Parm.Name));
@ -2490,6 +2498,40 @@ namespace FreeSql.Internal
//return string.Concat(_ado.AddslashesProcessParam(obj, mapType, mapColumn));
}
public static Expression[] MatchDtoProperty(SelectTableInfo tb, PropertyInfo dtoProp)
{
if (tb == null || dtoProp == null || tb.Parameter == null) return null;
var exp = LocalMatch(tb.Parameter.Type, tb.Parameter);
if (exp == null) return null;
var exps = new Stack<Expression>();
while (true)
{
exps.Push(exp);
exp = (exp as MemberExpression).Expression;
if (exp.NodeType == ExpressionType.Parameter) break;
}
if (exps.Any()) return exps.ToArray();
return null;
Expression LocalMatch(Type type, Expression memExp)
{
var typeProps = type.GetPropertiesDictIgnoreCase();
if (typeProps.TryGetValue(dtoProp.Name, out var prop))
return Expression.MakeMemberAccess(memExp, prop);
if (tb.Table.Columns.Any() == false) //匿名类，嵌套查询 DTO
{
foreach (var typeProp in typeProps.Values)
{
if (Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(type)) return null;
var nextExp = Expression.MakeMemberAccess(memExp, typeProp);
var ret = LocalMatch(typeProp.PropertyType, nextExp);
if (ret != null) return ret;
}
}
return null;
}
}
public static void ParseExpressionNoAsSelect(object sender, Aop.ParseExpressionEventArgs e, Func<Type, string, string> tableRule, List<GlobalFilter.Item> whereGlobalFilter)
{
if (e.Expression.NodeType != ExpressionType.Call &&

5
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@ -655,11 +655,6 @@ namespace FreeSql.Internal.CommonProvider
if (col.Attribute.MapType == col.CsType) val = value;
else val = Utils.GetDataReaderValue(col.Attribute.MapType, value);
_set.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ");
if (value == null)
{
_set.Append("NULL");
return;
}
var colsql = _noneParameter ? _commonUtils.GetNoneParamaterSqlValue(_params, "u", col, col.Attribute.MapType, val) :
_commonUtils.QuoteWriteParamterAdapter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_params.Count}"));