Update Oracle

This commit is contained in:
sunkaixuan 2022-12-11 20:09:25 +08:00
parent 3f29e6b0aa
commit 638d12309a
4 changed files with 78 additions and 14 deletions

View File

@ -323,14 +323,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(this.SqlBuilder.GetTranslationColumnName(item.DbColumnName) , item.DbTableName.ToUpper());
db.DbMaintenance.AddColumnRemark(this.SqlBuilder.GetTranslationColumnName(item.DbColumnName), item.DbTableName.ToUpper(), item.ColumnDescription);
db.DbMaintenance.DeleteColumnRemark(this.SqlBuilder.GetTranslationColumnName(item.DbColumnName) , item.DbTableName.ToUpper(IsUppper));
db.DbMaintenance.AddColumnRemark(this.SqlBuilder.GetTranslationColumnName(item.DbColumnName), 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);
}
}
}
@ -462,7 +462,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;
@ -478,7 +478,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;
});
@ -494,7 +494,7 @@ namespace SqlSugar
string sql = "SELECT TABLE_NAME AS TableName, COLUMN_NAME AS DbColumnName,COMMENTS AS ColumnDescription FROM user_col_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<DbColumnInfo>(sql, new { tableName = tableName.ToUpper() });
var pks = this.Context.Ado.SqlQuery<DbColumnInfo>(sql, new { tableName = tableName.ToUpper(IsUppper) });
this.Context.Ado.IsEnableLogEvent = oldIsEnableLog;
return pks;
});
@ -538,5 +538,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
}
}

View File

@ -38,17 +38,17 @@ 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 override string RemoveParentheses(string sql)
{
@ -59,5 +59,21 @@ namespace SqlSugar
return sql;
}
#region Helper
public bool IsUppper
{
get
{
if (this.Context.CurrentConnectionConfig.MoreSettings == null)
{
return true;
}
else
{
return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true;
}
}
}
#endregion
}
}

View File

@ -28,7 +28,7 @@ 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)
{
@ -39,11 +39,11 @@ namespace SqlSugar
return columnName;
}
else
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 override bool IsTranslationText(string name)
{
@ -54,6 +54,20 @@ namespace SqlSugar
var result = name.IsContainsIn(SqlTranslationLeft, SqlTranslationRight, UtilConstants.Space, ExpressionConst.LeftParenthesis, ExpressionConst.RightParenthesis);
return result;
}
public bool IsUppper
{
get
{
if (this.SugarContext?.Context?.Context?.CurrentConnectionConfig?.MoreSettings == null)
{
return true;
}
else
{
return this.SugarContext?.Context?.Context?.CurrentConnectionConfig?.MoreSettings.IsAutoToUpper == true;
}
}
}
}
public partial class OracleMethod : DefaultDbMethod, IDbMethods
{

View File

@ -33,7 +33,7 @@ namespace SqlSugar
private string GetOracleUpdateColums(DbColumnInfo m)
{
return string.Format("\"{0}\"={1}", m.DbColumnName.ToUpper(), FormatValue(m.Value,m.IsPrimarykey,m.PropertyName));
return string.Format("\"{0}\"={1}", m.DbColumnName.ToUpper(IsUppper), FormatValue(m.Value,m.IsPrimarykey,m.PropertyName));
}
int i = 0;
public object FormatValue(object value,bool isPrimaryKey,string name)
@ -112,5 +112,22 @@ namespace SqlSugar
}
}
}
#region Helper
public bool IsUppper
{
get
{
if (this.Context.CurrentConnectionConfig.MoreSettings == null)
{
return true;
}
else
{
return this.Context.CurrentConnectionConfig.MoreSettings.IsAutoToUpper == true;
}
}
}
#endregion
}
}