lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-10-15 18:55:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan
2022-10-17 00:53:22 +08:00
parent 083f37b3de
commit 0f796ceace
2 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavSelectHelper.cs
View File

@@ -24,7 +24,8 @@ namespace SqlSugar
var includeQueryable = queryableProvider.Clone();
includeQueryable.Select(GetGroupSelect(typeof(T), queryableProvider.Context, queryableProvider.QueryBuilder));
includeQueryable.QueryBuilder.NoCheckInclude = true;
MegerList(result, includeQueryable.ToList(), sqlfuncQueryable.Context);
var mappingColumn = GetMappingColumn(expression);
MegerList(result, includeQueryable.ToList(), sqlfuncQueryable.Context,mappingColumn);
}
else if (isSqlFunc)
{
@@ -87,20 +88,37 @@ namespace SqlSugar
private static List<TResult> SqlFunc<T, TResult>(Expression<Func<T, TResult>> expression, QueryableProvider<T> queryableProvider)
{
var mappingColumn = GetMappingColumn(expression);
if (mappingColumn.Any(it => it.IsError))
{
return Action(expression,queryableProvider);
}
List<TResult> result;
var sqlfuncQueryable = queryableProvider.Clone();
var dtoEntity = sqlfuncQueryable.Context.EntityMaintenance.GetEntityInfo<TResult>().Columns;
var tableEntity = sqlfuncQueryable.Context.EntityMaintenance.GetEntityInfo<T>().Columns;
var ignoreColumns = GetIgnoreColumns(dtoEntity,tableEntity);
sqlfuncQueryable.QueryBuilder.Includes = null;
result = sqlfuncQueryable
.IgnoreColumns(ignoreColumns)
.Select(expression)
.ToList();
var selector = GetDefaultSelector(queryableProvider.Context.EntityMaintenance.GetEntityInfo<T>(), queryableProvider.QueryBuilder);
var queryable = queryableProvider.Select(selector).Clone();
queryable.QueryBuilder.NoCheckInclude = true;
var includeList = queryable.ToList();
MegerList(result, includeList, sqlfuncQueryable.Context);
MegerList(result, includeList, sqlfuncQueryable.Context,mappingColumn);
return result;
}
private static string[] GetIgnoreColumns(List<EntityColumnInfo> dtoEntity, List<EntityColumnInfo> tableEntity)
{
var column = (from dto in dtoEntity
join tab in tableEntity on dto.PropertyInfo.PropertyType equals tab.PropertyInfo.PropertyType
where tab.Navigat!=null
select tab.PropertyName).Distinct().ToArray();
return column;
}
internal static async Task<List<TResult>> GetListAsync<T, TResult>(Expression<Func<T, TResult>> expression, QueryableProvider<T> queryableProvider)
{
@@ -160,7 +178,7 @@ namespace SqlSugar
return columns;
}
private static void MegerList<TResult, T>(List<TResult> result, List<T> includeList,SqlSugarProvider context)
private static void MegerList<TResult, T>(List<TResult> result, List<T> includeList,SqlSugarProvider context,List<NavMappingColumn> navMappingColumns)
{
if (result.Count != includeList.Count) return;
var columns = context.EntityMaintenance.GetEntityInfo<T>().Columns;
@@ -178,6 +196,15 @@ namespace SqlSugar
z.PropertyName.Equals(column.PropertyName)&&
z.PropertyInfo.PropertyType==column.PropertyInfo.PropertyType
);
if (resColumn == null && navMappingColumns.Any(z => z.Value == column.PropertyName))
{
var mappingColumn = navMappingColumns.First(z => z.Value == column.PropertyName);
resColumn = resColumns
.FirstOrDefault(z =>
z.PropertyName.Equals(mappingColumn.Key) &&
z.PropertyInfo.PropertyType == column.PropertyInfo.PropertyType
);
}
if (resColumn != null)
{
var resItem= result[i];
@@ -245,11 +272,63 @@ namespace SqlSugar
}
return false;
}
private static List<NavMappingColumn> GetMappingColumn(Expression expression)
{
var body = ExpressionTool.GetLambdaExpressionBody(expression);
List<NavMappingColumn> result = new List<NavMappingColumn>();
if (body is NewExpression)
{
var index = 0;
var arg = ((NewExpression)body).Arguments;
var members = ((NewExpression)body).Members;
foreach (var item in arg)
{
var name=members[index].Name;
if (item is MethodCallExpression)
{
var method = (item as MethodCallExpression);
if (method.Method.Name == "ToList"&&method.Arguments.Count>0&& method.Arguments[0] is MethodCallExpression)
{
method = (MethodCallExpression)method.Arguments[0];
}
if (method.Method.Name == "Select")
{
if (!item.ToString().Contains("Subqueryable"))
{
result.Add(new NavMappingColumn() { IsError = true });
}
}
}
index++;
}
}
else if (body is MemberInitExpression)
{
foreach (var item in ((MemberInitExpression)body).Bindings)
{
MemberAssignment memberAssignment = (MemberAssignment)item;
var key= memberAssignment.Member.Name;
var value = memberAssignment.Expression;
if (memberAssignment.Expression is MemberExpression)
{
result.Add(new NavMappingColumn() { Key=key,Value= ExpressionTool.GetMemberName(memberAssignment.Expression) });
}
}
}
return result;
}
private static bool isGroup<T, TResult>(Expression<Func<T, TResult>> expression, QueryableProvider<T> queryableProvider)
{
var isGroup=queryableProvider.QueryBuilder.GetGroupByString.HasValue();
return isGroup;
}
internal class NavMappingColumn
{
public string Key { get; set; }
public string Value { get; set; }
public bool IsError { get; set; }
}
}
}

14
Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@@ -604,7 +604,19 @@ namespace SqlSugar
public virtual string GetSelectValueByExpression()
{
var expression = this.SelectValue as Expression;
var result = GetExpressionValue(expression, this.SelectType).GetResultString();
string result = string.Empty;
if (this.IgnoreColumns != null && this.IgnoreColumns.Any())
{
var expArray = GetExpressionValue(expression, this.SelectType).GetResultArray()
.Where(it=>
!this.IgnoreColumns.Any(z=>it.Contains(Builder.GetTranslationColumnName(z)))
).ToArray();
result =string.Join(",", expArray);
}
else
{
result= GetExpressionValue(expression, this.SelectType).GetResultString();
}
if (result == null)
{
return "*";