From bfbbebab886e62e34a9dd9c48677f254c2e45750 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Thu, 9 May 2024 12:26:40 +0800
Subject: [PATCH] Synchronization code

---
 Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs          | 1 +
 .../Oracle/DbMaintenance/OracleDbMaintenance.cs            | 7 +++++++
 Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs              | 1 +
 3 files changed, 9 insertions(+)

diff --git a/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs b/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs
index d6827dbeb..a9fdbf568 100644
--- a/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs
+++ b/Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs
@@ -22,6 +22,7 @@ namespace SqlSugar
         public DateTime? DbMinDate { get; set; } = DateTime.MinValue.Date.AddYears(1900 - 1);
         public bool IsNoReadXmlDescription { get;  set; }
         public bool SqlServerCodeFirstNvarchar { get;  set; }
+        public bool OracleCodeFirstNvarchar2 { get; set; }
         public bool SqliteCodeFirstEnableDefaultValue { get; set; }
         public bool SqliteCodeFirstEnableDescription { get; set; }
         public bool IsAutoUpdateQueryFilter { get; set; }
diff --git a/Src/Asp.Net/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
index e70139802..d542ee0d9 100644
--- a/Src/Asp.Net/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
@@ -617,6 +617,13 @@ WHERE table_name = '"+tableName+"'");
                     {
                         item.DataType = "NUMBER GENERATED ALWAYS AS IDENTITY";
                     }
+                    if (item.DataType != null && this.Context.CurrentConnectionConfig?.MoreSettings?.OracleCodeFirstNvarchar2 == true)
+                    {
+                        if (!item.DataType.ToLower().Contains("nvarchar2"))
+                        {
+                            item.DataType = item.DataType.ToLower().Replace("varchar", "nvarchar2");
+                        }
+                    }
                 }
             }
             string sql = GetCreateTableSql(tableName, columns);
diff --git a/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
index 5267b724a..709c70b85 100644
--- a/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
+++ b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
@@ -647,6 +647,7 @@ namespace SqlSugar
                     DbMinDate=it.MoreSettings.DbMinDate,
                     IsNoReadXmlDescription=it.MoreSettings.IsNoReadXmlDescription,
                     SqlServerCodeFirstNvarchar=it.MoreSettings.SqlServerCodeFirstNvarchar,
+                    OracleCodeFirstNvarchar2=it.MoreSettings.OracleCodeFirstNvarchar2,
                     IsAutoToUpper=it.MoreSettings.IsAutoToUpper,
                     IsAutoDeleteQueryFilter=it.MoreSettings.IsAutoDeleteQueryFilter,
                     IsAutoUpdateQueryFilter = it.MoreSettings.IsAutoUpdateQueryFilter,