lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-12-26 14:15:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update core

Browse Source
This commit is contained in:
sunkaixuan
2022-03-30 12:24:55 +08:00
parent a868445f6d
commit e3d9122c67
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Src/Asp.NetCore2/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
View File

@@ -73,6 +73,20 @@ namespace SqlSugar
#endregion
#region Connection
public virtual bool IsValidConnection()
{
try
{
using (OpenAlways())
{
return true;
}
}
catch (Exception)
{
return false;
}
}
public virtual void Open()
{
CheckConnection();

1
Src/Asp.NetCore2/SqlSugar/Interface/IAdo.cs
View File

@@ -164,6 +164,7 @@ namespace SqlSugar
void Close();
void Open();
SugarConnection OpenAlways();
bool IsValidConnection();
void CheckConnection();
void BeginTran();

10
Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs
View File

@@ -27,7 +27,8 @@ namespace SqlSugar
}
}
}
public override object FormatValue(object value)
int i = 0;
public object FormatValue(object value,string name)
{
var n = "N";
if (this.Context.CurrentConnectionConfig.MoreSettings != null && this.Context.CurrentConnectionConfig.MoreSettings.DisableNvarchar)
@@ -72,7 +73,10 @@ namespace SqlSugar
}
else if (type == UtilConstants.StringType || type == UtilConstants.ObjType)
{
return n+"'" + GetString(value).ToSqlFilter() + "'";
++i;
var parameterName = this.Builder.SqlParameterKeyWord + name + i;
this.Parameters.Add(new SugarParameter(parameterName, value));
return parameterName;
}
else
{
@@ -115,7 +119,7 @@ namespace SqlSugar
foreach (var item in groupList)
{
batchInsetrSql.Append("(");
insertColumns = string.Join(",", item.Select(it => FormatValue(it.Value)));
insertColumns = string.Join(",", item.Select(it => FormatValue(it.Value,it.PropertyName)));
batchInsetrSql.Append(insertColumns);
if (groupList.Last() == item)
{

10
Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlUpdateBuilder.cs
View File

@@ -59,7 +59,7 @@ namespace SqlSugar
{
updateTable.Append(SqlTemplateBatchUnion);
}
updateTable.Append("\r\n SELECT " + string.Join(",", columns.Select(it => string.Format(SqlTemplateBatchSelect, FormatValue(it.Value),this.Builder.GetTranslationColumnName(it.DbColumnName)))));
updateTable.Append("\r\n SELECT " + string.Join(",", columns.Select(it => string.Format(SqlTemplateBatchSelect, FormatValue(it.Value,it.PropertyName),this.Builder.GetTranslationColumnName(it.DbColumnName)))));
++i;
}
pageIndex++;
@@ -89,7 +89,8 @@ namespace SqlSugar
}
return batchUpdateSql.ToString();
}
public override object FormatValue(object value)
int i = 0;
public object FormatValue(object value,string name)
{
var n = "N";
if (this.Context.CurrentConnectionConfig.MoreSettings != null&&this.Context.CurrentConnectionConfig.MoreSettings.DisableNvarchar)
@@ -142,7 +143,10 @@ namespace SqlSugar
}
else if (type == UtilConstants.StringType || type == UtilConstants.ObjType)
{
return n+"'" + GetString(value).ToSqlFilter() + "'";
++i;
var parameterName = this.Builder.SqlParameterKeyWord + name + i;
this.Parameters.Add(new SugarParameter(parameterName, value));
return parameterName;
}
else
{

5
Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleExpressionContext.cs
View File

@@ -57,6 +57,11 @@ namespace SqlSugar
}
public partial class OracleMethod : DefaultDbMethod, IDbMethods
{
public override string HasValue(MethodCallExpressionModel model)
{
var parameter = model.Args[0];
return string.Format("( {0} IS NOT NULL ) ", parameter.MemberName);
}
public override string DateDiff(MethodCallExpressionModel model)
{