mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-10-15 18:55:07 +08:00
Update exp to sql
This commit is contained in:
@@ -342,6 +342,9 @@ namespace SqlSugar
|
||||
queryable.SqlBuilder.QueryBuilder.EasyJoinInfos = this.GetEasyJoinInfo(joinExpression, ref shortName, queryable.SqlBuilder, types);
|
||||
queryable.SqlBuilder.QueryBuilder.TableShortName = shortName;
|
||||
queryable.SqlBuilder.QueryBuilder.JoinExpression = joinExpression;
|
||||
var isNoPgAuto = this.Context.CurrentConnectionConfig.MoreSettings?.PgSqlIsAutoToLower == false;
|
||||
if (isNoPgAuto)
|
||||
queryable.SqlBuilder.QueryBuilder.TableShortName = queryable.SqlBuilder.GetTranslationColumnName(shortName);
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -522,10 +525,18 @@ namespace SqlSugar
|
||||
Dictionary<string, string> result = new Dictionary<string, string>();
|
||||
var lambdaParameters = ((LambdaExpression)joinExpression).Parameters.ToList();
|
||||
shortName = lambdaParameters.First().Name;
|
||||
var isNoPgAuto = this.Context.CurrentConnectionConfig.MoreSettings?.PgSqlIsAutoToLower == false;
|
||||
var index = 1;
|
||||
foreach (var item in entityTypeArray)
|
||||
{
|
||||
result.Add(UtilConstants.Space + lambdaParameters[index].Name, item.Name);
|
||||
if (isNoPgAuto)
|
||||
{
|
||||
result.Add(UtilConstants.Space +builder.GetTranslationColumnName(lambdaParameters[index].Name), item.Name);
|
||||
}
|
||||
else
|
||||
{
|
||||
result.Add(UtilConstants.Space + lambdaParameters[index].Name, item.Name);
|
||||
}
|
||||
++index;
|
||||
}
|
||||
return result;
|
||||
|
@@ -25,7 +25,14 @@ namespace SqlSugar
|
||||
case ResolveExpressType.SelectMultiple:
|
||||
if (parameter.BaseParameter!=null&¶meter.BaseParameter.CurrentExpression.NodeType == ExpressionType.Lambda)
|
||||
{
|
||||
this.Context.Result.Append(expression.Name + ".*");
|
||||
if (this.Context.PgSqlIsAutoToLower == false&&this.Context is PostgreSQLExpressionContext)
|
||||
{
|
||||
this.Context.Result.Append(this.Context.GetTranslationColumnName(expression.Name) + ".*");
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Context.Result.Append(expression.Name + ".*");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user