lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-08-23 22:11:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update MySql

Browse Source
This commit is contained in:
sunkaixuan 2017-06-25 14:11:04 +08:00
parent a665508df1
commit ff5c89b76f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs
View File

@ -282,7 +282,7 @@ namespace SqlSugar
}
else
{
var asName = "[" + item.Type.Name + "." + property.Name + "]";
var asName = this.Context.GetTranslationText(item.Type.Name + "." + property.Name );
var columnName = property.Name;
if (Context.IsJoin)
{

7
Src/Asp.Net/SqlSugar/SqlSugarAccessory.cs
View File

@ -183,7 +183,7 @@ namespace SqlSugar
this.CreateQueryable<T>(queryable);
string shortName = string.Empty;
List<SugarParameter> paramters =new List<SugarParameter>();
queryable.SqlBuilder.QueryBuilder.JoinQueryInfos = this.GetJoinInfos(joinExpression,ref paramters, ref shortName, types);
queryable.SqlBuilder.QueryBuilder.JoinQueryInfos = this.GetJoinInfos(queryable.SqlBuilder,joinExpression, ref paramters, ref shortName, types);
queryable.SqlBuilder.QueryBuilder.TableShortName = shortName;
if (paramters != null) {
queryable.SqlBuilder.QueryBuilder.Parameters.AddRange(paramters);
@ -199,11 +199,11 @@ namespace SqlSugar
#endregion
#region Private methods
protected List<JoinQueryInfo> GetJoinInfos(Expression joinExpression,ref List<SugarParameter> parameters, ref string shortName, params Type[] entityTypeArray)
protected List<JoinQueryInfo> GetJoinInfos(ISqlBuilder sqlBuilder,Expression joinExpression,ref List<SugarParameter> parameters, ref string shortName, params Type[] entityTypeArray)
{
List<JoinQueryInfo> result = new List<JoinQueryInfo>();
var lambdaParameters = ((LambdaExpression)joinExpression).Parameters.ToList();
ExpressionContext expressionContext = new ExpressionContext();
ILambdaExpressions expressionContext = sqlBuilder.QueryBuilder.LambdaExpressions;
expressionContext.MappingColumns = this.Context.MappingColumns;
expressionContext.MappingTables = this.Context.MappingTables;
expressionContext.Resolve(joinExpression, ResolveExpressType.Join);
@ -238,6 +238,7 @@ namespace SqlSugar
joinInfo.JoinIndex = i;
result.Add((joinInfo));
}
expressionContext.Clear();
return result;
}
protected Dictionary<string,string> GetEasyJoinInfo(Expression joinExpression, ref string shortName, ISqlBuilder builder, params Type[] entityTypeArray)