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

Update Core

Browse Source
This commit is contained in:
sunkaixuan 2022-05-11 13:58:17 +08:00
parent 704c5c6072
commit 1325c7ddd4
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
View File

@ -216,7 +216,8 @@ namespace SqlSugar
this.Context.Updateable(dt)
.AS(tableName)
.Where($"{columnInfo.DbColumnName} is null ").ExecuteCommand();
columnInfo.IsNullable = false;
if(this.Context.CurrentConnectionConfig.DbType!=DbType.Oracle)
columnInfo.IsNullable = false;
UpdateColumn(tableName, columnInfo);
}
return true;

2
Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/Private.cs
View File

@ -85,7 +85,7 @@ namespace SqlSugar
value = DBNull.Value;
}
}
else if (column.UnderType == UtilConstants.DateTimeOffsetType&& value!=null)
else if (column.UnderType == UtilConstants.DateTimeOffsetType&& value!=null && value != DBNull.Value)
{
value = UtilMethods.ConvertFromDateTimeOffset((DateTimeOffset)value);
}

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs
View File

@ -48,13 +48,13 @@ namespace SqlSugar
var selfParameterName = meExp.Parameters.First().Name;
if ((meExp.Body is BinaryExpression))
{
context.SingleTableNameSubqueryShortName = (((meExp.Body as BinaryExpression).Left as MemberExpression).Expression as ParameterExpression).Name;
context.SingleTableNameSubqueryShortName = (((meExp.Body as BinaryExpression).Left as MemberExpression)?.Expression as ParameterExpression)?.Name;
}
if (context.SingleTableNameSubqueryShortName == selfParameterName)
{
if (meExp.Body is BinaryExpression)
{
context.SingleTableNameSubqueryShortName = (((meExp.Body as BinaryExpression).Right as MemberExpression).Expression as ParameterExpression).Name;
context.SingleTableNameSubqueryShortName = (((meExp.Body as BinaryExpression).Right as MemberExpression)?.Expression as ParameterExpression)?.Name;
}
}
}

4
Src/Asp.NetCore2/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
View File

@ -318,8 +318,8 @@ namespace SqlSugar
//column remak
if (db.DbMaintenance.IsAnyColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper()))
{
db.DbMaintenance.DeleteColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper());
db.DbMaintenance.AddColumnRemark(item.DbColumnName.ToUpper(), item.DbTableName.ToUpper(), item.ColumnDescription);
db.DbMaintenance.DeleteColumnRemark(this.SqlBuilder.GetTranslationColumnName(item.DbColumnName) , item.DbTableName.ToUpper());
db.DbMaintenance.AddColumnRemark(this.SqlBuilder.GetTranslationColumnName(item.DbColumnName), item.DbTableName.ToUpper(), item.ColumnDescription);
}
else
{