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

Update dm

Browse Source
This commit is contained in:
sunkaixuan 2022-12-11 19:16:24 +08:00
parent 750e3e716d
commit 669cfa235c
6 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs
View File

@ -14,6 +14,7 @@ namespace SqlSugar
public bool DisableMillisecond { get; set; }
public bool PgSqlIsAutoToLower = true;
public bool PgSqlIsAutoToLowerCodeFirst = true;
public bool IsAutoToUpper = true;
public int DefaultCacheDurationInSeconds { get; set; }
public bool? TableEnumIsString { get; set; }
public DateTime? DbMinDate { get; set; } = Convert.ToDateTime("1900-01-01");

31
Src/Asp.Net/SqlSugar/Realization/Dm/DbMaintenance/DmDbMaintenance.cs
View File

@ -314,14 +314,14 @@ namespace SqlSugar
if (item.ColumnDescription != null)
{
//column remak
if (db.DbMaintenance.IsAnyColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper()))
if (db.DbMaintenance.IsAnyColumnRemark(item.DbColumnName.ToUpper(IsUppper), item.DbTableName.ToUpper(IsUppper)))
{
db.DbMaintenance.DeleteColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper());
db.DbMaintenance.AddColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper(), item.ColumnDescription);
db.DbMaintenance.DeleteColumnRemark(item.DbColumnName.ToUpper(IsUppper), item.DbTableName.ToUpper(IsUppper));
db.DbMaintenance.AddColumnRemark(item.DbColumnName.ToUpper(IsUppper), item.DbTableName.ToUpper(IsUppper), item.ColumnDescription);
}
else
{
db.DbMaintenance.AddColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper(), item.ColumnDescription);
db.DbMaintenance.AddColumnRemark(item.DbColumnName.ToUpper(IsUppper), item.DbTableName.ToUpper(IsUppper), item.ColumnDescription);
}
}
}
@ -398,7 +398,7 @@ namespace SqlSugar
this.Context.Ado.IsEnableLogEvent = false;
string sql = @" select distinct cu.COLUMN_name KEYNAME from user_cons_columns cu, user_constraints au
where cu.constraint_name = au.constraint_name
and au.constraint_type = 'P' and au.table_name = '" + tableName.ToUpper() + @"'";
and au.constraint_type = 'P' and au.table_name = '" + tableName.ToUpper(IsUppper) + @"'";
var pks = this.Context.Ado.SqlQuery<string>(sql);
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
@ -414,7 +414,7 @@ namespace SqlSugar
string sql = "SELECT COMMENTS FROM USER_TAB_COMMENTS WHERE TABLE_NAME =@tableName ORDER BY TABLE_NAME";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var pks = this.Context.Ado.SqlQuery<string>(sql, new { tableName = tableName.ToUpper() });
var pks = this.Context.Ado.SqlQuery<string>(sql, new { tableName = tableName.ToUpper(IsUppper) });
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
@ -427,7 +427,7 @@ namespace SqlSugar
var comments = this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey,
() =>
{
string sql = "SELECT TVNAME AS TableName, COLNAME as DbColumnName ,COMMENT$ AS ColumnDescription from SYSCOLUMNCOMMENTS WHERE TVNAME='" + tableName.ToUpper() + "' ORDER BY TVNAME";
string sql = "SELECT TVNAME AS TableName, COLNAME as DbColumnName ,COMMENT$ AS ColumnDescription from SYSCOLUMNCOMMENTS WHERE TVNAME='" + tableName.ToUpper(IsUppper) + "' ORDER BY TVNAME";
var oldIsEnableLog = this.Context.Ado.IsEnableLogEvent;
this.Context.Ado.IsEnableLogEvent = false;
var pks = this.Context.Ado.SqlQuery<DbColumnInfo>(sql);
@ -470,5 +470,22 @@ namespace SqlSugar
return true;
}
#endregion
#region Helper
public bool IsUppper
{
get
{
if (this.Context.CurrentConnectionConfig.MoreSettings == null)
{
return true;
}
else
{
return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true;
}
}
}
#endregion
}
}

20
Src/Asp.Net/SqlSugar/Realization/Dm/SqlBuilder/DmBuilder.cs
View File

@ -35,17 +35,31 @@ namespace SqlSugar
if (result.Contains("(") && result.Contains(")"))
return result;
else
return result.ToUpper();
return result.ToUpper(IsUppper);
}
public override string GetTranslationColumnName(string entityName, string propertyName)
{
var result = base.GetTranslationColumnName(entityName, propertyName);
return result.ToUpper();
return result.ToUpper(IsUppper);
}
public override string GetTranslationColumnName(string propertyName)
{
var result = base.GetTranslationColumnName(propertyName);
return result.ToUpper();
return result.ToUpper(IsUppper);
}
public bool IsUppper
{
get
{
if (this.Context.CurrentConnectionConfig.MoreSettings == null)
{
return true;
}
else
{
return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true;
}
}
}
}
}

20
Src/Asp.Net/SqlSugar/Realization/Dm/SqlBuilder/DmExpressionContext.cs
View File

@ -27,15 +27,29 @@ namespace SqlSugar
public override string SqlTranslationRight { get { return "\""; } }
public override string GetTranslationTableName(string entityName, bool isMapping = true)
{
return base.GetTranslationTableName(entityName, isMapping).ToUpper();
return base.GetTranslationTableName(entityName, isMapping).ToUpper(IsUppper);
}
public override string GetTranslationColumnName(string columnName)
{
return base.GetTranslationColumnName(columnName).ToUpper();
return base.GetTranslationColumnName(columnName).ToUpper(IsUppper);
}
public override string GetDbColumnName(string entityName, string propertyName)
{
return base.GetDbColumnName(entityName, propertyName).ToUpper();
return base.GetDbColumnName(entityName, propertyName).ToUpper(IsUppper);
}
public bool IsUppper
{
get
{
if (this.Context.CurrentConnectionConfig.MoreSettings == null)
{
return true;
}
else
{
return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true;
}
}
}
}
public partial class DmMethod : DefaultDbMethod, IDbMethods

6
Src/Asp.Net/SqlSugar/Utilities/DbExtensions.cs
View File

@ -96,5 +96,11 @@ namespace SqlSugar
if (isAutoToLower == false) return value;
return value.ToLower();
}
internal static string ToUpper(this string value, bool isAutoToUpper)
{
if (value == null) return null;
if (isAutoToUpper == false) return value;
return value.ToUpper();
}
}
}

3
Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
View File

@ -179,7 +179,8 @@ namespace SqlSugar
DisableMillisecond = it.MoreSettings.DisableMillisecond,
DbMinDate=it.MoreSettings.DbMinDate,
IsNoReadXmlDescription=it.MoreSettings.IsNoReadXmlDescription,
SqlServerCodeFirstNvarchar=it.MoreSettings.SqlServerCodeFirstNvarchar
SqlServerCodeFirstNvarchar=it.MoreSettings.SqlServerCodeFirstNvarchar,
IsAutoToUpper=it.MoreSettings.IsAutoToUpper
},
SqlMiddle = it.SqlMiddle == null ? null : new SqlMiddle