Update Oracle

This commit is contained in:
sunkaixuan
2022-04-07 21:43:50 +08:00
parent 8c9870e381
commit 057a4d0845

View File

@@ -351,13 +351,13 @@ namespace SqlSugar
try try
{ {
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle==true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return this.Context.CurrentConnectionConfig.SqlMiddle.ExecuteCommand(sql, parameters); return this.Context.CurrentConnectionConfig.SqlMiddle.ExecuteCommand(sql, parameters);
SetConnectionStart(sql); SetConnectionStart(sql);
if (this.ProcessingEventStartingSQL != null) if (this.ProcessingEventStartingSQL != null)
ExecuteProcessingSQL(ref sql,ref parameters); ExecuteProcessingSQL(ref sql, ref parameters);
ExecuteBefore(sql, parameters); ExecuteBefore(sql, parameters);
IDbCommand sqlCommand = GetCommand(sql, parameters); IDbCommand sqlCommand = GetCommand(sql, parameters);
int count = sqlCommand.ExecuteNonQuery(); int count = sqlCommand.ExecuteNonQuery();
@@ -385,7 +385,7 @@ namespace SqlSugar
try try
{ {
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return this.Context.CurrentConnectionConfig.SqlMiddle.GetDataReader(sql, parameters); return this.Context.CurrentConnectionConfig.SqlMiddle.GetDataReader(sql, parameters);
@@ -419,7 +419,7 @@ namespace SqlSugar
try try
{ {
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return this.Context.CurrentConnectionConfig.SqlMiddle.GetDataSetAll(sql, parameters); return this.Context.CurrentConnectionConfig.SqlMiddle.GetDataSetAll(sql, parameters);
@@ -456,7 +456,7 @@ namespace SqlSugar
try try
{ {
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return this.Context.CurrentConnectionConfig.SqlMiddle.GetScalar(sql, parameters); return this.Context.CurrentConnectionConfig.SqlMiddle.GetScalar(sql, parameters);
@@ -493,7 +493,7 @@ namespace SqlSugar
{ {
Async(); Async();
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return await this.Context.CurrentConnectionConfig.SqlMiddle.ExecuteCommandAsync(sql, parameters); return await this.Context.CurrentConnectionConfig.SqlMiddle.ExecuteCommandAsync(sql, parameters);
@@ -532,7 +532,7 @@ namespace SqlSugar
{ {
Async(); Async();
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return await this.Context.CurrentConnectionConfig.SqlMiddle.GetDataReaderAsync(sql, parameters); return await this.Context.CurrentConnectionConfig.SqlMiddle.GetDataReaderAsync(sql, parameters);
@@ -571,7 +571,7 @@ namespace SqlSugar
{ {
Async(); Async();
InitParameters(ref sql, parameters); InitParameters(ref sql, parameters);
if (FormatSql != null) if (IsFormat(parameters))
sql = FormatSql(sql); sql = FormatSql(sql);
if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true) if (this.Context.CurrentConnectionConfig?.SqlMiddle?.IsSqlMiddle == true)
return await this.Context.CurrentConnectionConfig.SqlMiddle.GetScalarAsync(sql, parameters); return await this.Context.CurrentConnectionConfig.SqlMiddle.GetScalarAsync(sql, parameters);
@@ -1440,6 +1440,10 @@ namespace SqlSugar
var result = connectionString1Array.Except(connectionString2Array); var result = connectionString1Array.Except(connectionString2Array);
return result.Count() == 0; return result.Count() == 0;
} }
private bool IsFormat(SugarParameter[] parameters)
{
return FormatSql != null && parameters != null && parameters.Length > 0;
}
protected void SetConnectionEnd(string sql) protected void SetConnectionEnd(string sql)
{ {