diff --git a/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs b/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs index 33a07ba04..181ecb14c 100644 --- a/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs +++ b/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs @@ -32,6 +32,6 @@ namespace SqlSugar public bool IsCorrectErrorSqlParameterName { get; set; } public int MaxParameterNameLength { get; set; } public bool DisableQueryWhereColumnRemoveTrim { get; set; } - public DbType? DataBaseModel { get;set; } + public DbType? DatabaseModel { get;set; } } } diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelectStringJoin.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelectStringJoin.cs index 614fd3473..9837eef30 100644 --- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelectStringJoin.cs +++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelectStringJoin.cs @@ -57,6 +57,14 @@ namespace SqlSugar SetShortName(exp, result); + if (result == null&& ExpressionTool.GetLambdaExpressionBody(exp.Arguments[0]) is ConstantExpression ) + { + var constant = ExpressionTool.GetLambdaExpressionBody(exp.Arguments[0]) as ConstantExpression; + if (constant.Value?.ToString()?.Contains(",")==true) + { + result = string.Join(",",(constant.Value+"").Split(",").Select(it=>this.Context.GetTranslationTableName(it))); + } + } result = this.Context.DbMehtods.GetStringJoinSelector(result, ExpressionTool.GetExpressionValue(exp.Arguments[1]) + ""); return result; diff --git a/Src/Asp.Net/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs index 86ef41cea..6a1656c8f 100644 --- a/Src/Asp.Net/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs +++ b/Src/Asp.Net/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs @@ -609,7 +609,7 @@ WHERE tgrelid = '" + tableName + "'::regclass"); } private bool IsPgModel() { - return this.Context.CurrentConnectionConfig?.MoreSettings?.DataBaseModel == DbType.PostgreSQL; + return this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.PostgreSQL; } #endregion } diff --git a/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs index 5e1c451a8..7f3835e01 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs @@ -594,7 +594,7 @@ namespace SqlSugar SqliteCodeFirstEnableDropColumn=it.MoreSettings.SqliteCodeFirstEnableDropColumn, MaxParameterNameLength=it.MoreSettings.MaxParameterNameLength, DisableQueryWhereColumnRemoveTrim=it.MoreSettings.DisableQueryWhereColumnRemoveTrim, - DataBaseModel=it.MoreSettings.DataBaseModel + DatabaseModel=it.MoreSettings.DatabaseModel }, SqlMiddle = it.SqlMiddle == null ? null : new SqlMiddle