lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-15 20:49:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update .net core project

Browse Source
This commit is contained in:
sunkaixuan 2022-07-05 01:59:35 +08:00
parent 25e053f8ad
commit b1ccb6b37c
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -419,6 +419,10 @@ namespace SqlSugar
}
return this;
}
public ISugarQueryable<T> WhereColumns(Dictionary<string, object> dictionary)
{
return WhereColumns(new List<Dictionary<string, object>> { dictionary });
}
public ISugarQueryable<T> WhereColumns(List<Dictionary<string, object>> list)
{
List<IConditionalModel> conditionalModels = new List<IConditionalModel>();
@ -432,7 +436,7 @@ namespace SqlSugar
{
FieldName = item,
ConditionalType = ConditionalType.Equal,
FieldValue = model[item].ObjToString(),
FieldValue = model[item]==null?"null" : model[item].ObjToString(),
CSharpTypeName = model[item] == null ? null : model[item].GetType().Name
}));
i++;

2
Src/Asp.NetCore2/SqlSugar/Abstract/SaveableProvider/Storageable.cs
View File

@ -331,7 +331,7 @@ namespace SqlSugar
FieldName = item.DbColumnName,
ConditionalType = ConditionalType.Equal,
CSharpTypeName=UtilMethods.GetTypeName(value),
FieldValue = value + "",
FieldValue = value==null?"null":value.ObjToString(),
FieldValueConvertFunc=this.Context.CurrentConnectionConfig.DbType==DbType.PostgreSQL?
UtilMethods.GetTypeConvert(value):null
}));

11
Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs
View File

@ -164,8 +164,19 @@ namespace SqlSugar
switch (item.ConditionalType)
{
case ConditionalType.Equal:
if (item.FieldValue!=null&&item.FieldValue == "null"&&item.FieldValue!= "[null]")
{
builder.AppendFormat($" {item.FieldName.ToSqlFilter()} is null ");
}
else
{
if (item.FieldValue == "[null]")
{
item.FieldValue = "null";
}
builder.AppendFormat(temp, type, item.FieldName.ToSqlFilter(), "=", parameterName);
parameters.Add(new SugarParameter(parameterName, GetFieldValue(item)));
}
break;
case ConditionalType.Like:
builder.AppendFormat(temp, type, item.FieldName.ToSqlFilter(), "LIKE", parameterName);

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

@ -54,6 +54,7 @@ namespace SqlSugar
ISugarQueryable<T> WhereClassByPrimaryKey(List<T> list);
ISugarQueryable<T> WhereClassByPrimaryKey(T data) ;
ISugarQueryable<T> WhereColumns(List<Dictionary<string, object>> columns);
ISugarQueryable<T> WhereColumns(Dictionary<string, object> columns);
ISugarQueryable<T> TranLock(DbLockType LockType = DbLockType.Wait);
ISugarQueryable<T> Where(Expression<Func<T, bool>> expression);
ISugarQueryable<T> Where(string whereString, object parameters = null);

4
Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlBlukCopy.cs
View File

@ -176,6 +176,10 @@ namespace SqlSugar
{
sb.Append(row[colum].ObjToDate().ToString("yyyy-MM-dd HH:mm:ss.fff"));
}
else if (colum.DataType == UtilConstants.DateType && row[colum] != null && row[colum] == DBNull.Value)
{
sb.Append("NULL");
}
else sb.Append(row[colum].ToString());
}
sb.AppendLine();