From 1325c7ddd4e23395d4a392296ac1d7a9cde6a847 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Wed, 11 May 2022 13:58:17 +0800
Subject: [PATCH] Update  Core

---
 .../SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs        | 3 ++-
 Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/Private.cs | 2 +-
 .../SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs          | 4 ++--
 .../Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
index 77614e770..31ae780a9 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
@@ -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;
diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/Private.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/Private.cs
index 0ce09669a..ba5ae330a 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/Private.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/Private.cs
@@ -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);
                     }
diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs
index 4290ccb9f..7cd8c4016 100644
--- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs
+++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs
@@ -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;
                             }
                         }
                     }
diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
index eabbb6d8b..1ee48905c 100644
--- a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
@@ -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
                     {