diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs index eb42d23e3..be855c5f9 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/DbMaintenance/KdbndpDbMaintenance.cs @@ -260,7 +260,7 @@ namespace SqlSugar } } - return schema.ToUpper(); + return schema.ToUpper(IsUpper); } public override bool UpdateColumn(string tableName, DbColumnInfo columnInfo) { @@ -296,13 +296,13 @@ namespace SqlSugar public override bool IsAnyColumn(string tableName, string columnName, bool isCache = true) { var sql = - $"select count(*) from information_schema.columns WHERE table_schema = 'public' and UPPER(table_name) = '{tableName.ToUpper()}' and UPPER(column_name) = '{columnName.ToUpper()}'"; + $"select count(*) from information_schema.columns WHERE table_schema = 'public' and UPPER(table_name) = '{tableName.ToUpper(IsUpper)}' and UPPER(column_name) = '{columnName.ToUpper(IsUpper)}'"; return this.Context.Ado.GetInt(sql) > 0; } public override bool IsAnyTable(string tableName, bool isCache = true) { - var sql = $"select count(*) from information_schema.tables where table_schema='public' and table_type='BASE TABLE' and UPPER(table_name)='{tableName.ToUpper()}'"; + var sql = $"select count(*) from information_schema.tables where table_schema='public' and table_type='BASE TABLE' and UPPER(table_name)='{tableName.ToUpper(IsUpper)}'"; return this.Context.Ado.GetInt(sql)>0; } @@ -428,6 +428,20 @@ namespace SqlSugar { return base.GetColumnInfosByTableName(tableName.TrimEnd('"').TrimStart('"').ToLower(), isCache); } + public bool IsUpper + { + get + { + if (this.Context.CurrentConnectionConfig.MoreSettings == null) + { + return true; + } + else + { + return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true; + } + } + } #endregion } } diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpBuilder.cs index 68e812aa8..a848c3a98 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpBuilder.cs @@ -40,11 +40,11 @@ namespace SqlSugar { if (propertyName.Contains(".") && !propertyName.Contains(SqlTranslationLeft)) { - return string.Join(".", propertyName.Split('.').Select(it => $"{SqlTranslationLeft}{it.ToUpper()}{SqlTranslationRight}")); + return string.Join(".", propertyName.Split('.').Select(it => $"{SqlTranslationLeft}{it.ToUpper(IsUpper)}{SqlTranslationRight}")); } if (propertyName.Contains(SqlTranslationLeft)) return propertyName; else - return SqlTranslationLeft + propertyName.ToUpper() + SqlTranslationRight; + return SqlTranslationLeft + propertyName.ToUpper(IsUpper) + SqlTranslationRight; } //public override string GetNoTranslationColumnName(string name) @@ -61,7 +61,7 @@ namespace SqlSugar .FirstOrDefault(it => it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase) && it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); - return (mappingInfo == null ? SqlTranslationLeft + propertyName.ToUpper()+ SqlTranslationRight : SqlTranslationLeft + mappingInfo.DbColumnName.ToUpper() + SqlTranslationRight); + return (mappingInfo == null ? SqlTranslationLeft + propertyName.ToUpper(IsUpper)+ SqlTranslationRight : SqlTranslationLeft + mappingInfo.DbColumnName.ToUpper(IsUpper) + SqlTranslationRight); } public override string GetTranslationTableName(string name) @@ -75,7 +75,7 @@ namespace SqlSugar name = (mappingInfo == null ? name : mappingInfo.DbTableName); if (name.Contains(".")&& !name.Contains("(")) { - return string.Join(".", name.ToUpper().Split('.').Select(it => SqlTranslationLeft + it + SqlTranslationRight)); + return string.Join(".", name.ToUpper(IsUpper).Split('.').Select(it => SqlTranslationLeft + it + SqlTranslationRight)); } else if (name.Contains("(")) { @@ -87,7 +87,25 @@ namespace SqlSugar } else { - return SqlTranslationLeft + name.ToUpper().TrimEnd('"').TrimStart('"') + SqlTranslationRight; + return SqlTranslationLeft + name.ToUpper(IsUpper).TrimEnd('"').TrimStart('"') + SqlTranslationRight; + } + } + + /// + /// + /// + public bool IsUpper + { + get + { + if (this.Context.CurrentConnectionConfig.MoreSettings == null) + { + return true; + } + else + { + return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true; + } } } } diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpExpressionContext.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpExpressionContext.cs index f28cf0d8b..be10df526 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpExpressionContext.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Kdbndp/SqlBuilder/KdbndpExpressionContext.cs @@ -25,7 +25,7 @@ namespace SqlSugar } public override string GetTranslationText(string name) { - return SqlTranslationLeft + name.ToUpper() + SqlTranslationRight; + return SqlTranslationLeft + name.ToUpper(IsUpper) + SqlTranslationRight; } public override string GetTranslationTableName(string entityName, bool isMapping = true) @@ -47,7 +47,7 @@ namespace SqlSugar else if (isMapping) { var mappingInfo = this.MappingTables.FirstOrDefault(it => it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)); - return SqlTranslationLeft + (mappingInfo == null ? entityName : mappingInfo.DbTableName).ToUpper() + SqlTranslationRight; + return SqlTranslationLeft + (mappingInfo == null ? entityName : mappingInfo.DbTableName).ToUpper(IsUpper) + SqlTranslationRight; } else if (isComplex) { @@ -80,11 +80,25 @@ namespace SqlSugar if (this.MappingColumns.HasValue()) { var mappingInfo = this.MappingColumns.SingleOrDefault(it => it.EntityName == entityName && it.PropertyName == propertyName); - return (mappingInfo == null ? propertyName : mappingInfo.DbColumnName).ToUpper(); + return (mappingInfo == null ? propertyName : mappingInfo.DbColumnName).ToUpper(IsUpper); } else { - return propertyName.ToUpper(); + return propertyName.ToUpper(IsUpper); + } + } + public bool IsUpper + { + get + { + if (this.SugarContext?.Context?.Context?.CurrentConnectionConfig?.MoreSettings == null) + { + return true; + } + else + { + return this.SugarContext?.Context?.Context?.CurrentConnectionConfig?.MoreSettings.IsAutoToUpper == true; + } } } }