From 7bafb92f87d843ebd6f029df53a6467b3638fe2a Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Tue, 12 Nov 2024 17:00:12 +0800
Subject: [PATCH] =?UTF-8?q?Update=20=E6=B5=B7=E9=87=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PostgreSQL/DbBind/PostgreSQLDbBind.cs     | 25 +++++++++++++------
 .../SqlSugar/SqlSugarForCore.nuspec           |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/DbBind/PostgreSQLDbBind.cs b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/DbBind/PostgreSQLDbBind.cs
index 4fb2d0db0..1efa7f53d 100644
--- a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/DbBind/PostgreSQLDbBind.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/DbBind/PostgreSQLDbBind.cs
@@ -8,14 +8,7 @@ namespace SqlSugar
     {
         public override string GetDbTypeName(string csharpTypeName)
         {
-            if (csharpTypeName?.StartsWith("ora")==true&& this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase) 
-            {
-                csharpTypeName= csharpTypeName.Replace("ora", "");
-            }
-            else if (csharpTypeName?.StartsWith("mssql_") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
-            {
-                csharpTypeName = csharpTypeName.Replace("mssql_", "");
-            }
+            csharpTypeName = GetValidCsharpTypeName(csharpTypeName);
             if (csharpTypeName == UtilConstants.ByteArrayType.Name)
                 return "bytea";
             if (csharpTypeName.ToLower() == "int32")
@@ -34,9 +27,25 @@ namespace SqlSugar
             else
                 return "varchar";
         }
+
+        private string GetValidCsharpTypeName(string csharpTypeName)
+        {
+            if (csharpTypeName?.StartsWith("ora") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
+            {
+                csharpTypeName = csharpTypeName.Replace("ora", "");
+            }
+            else if (csharpTypeName?.StartsWith("mssql_") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
+            {
+                csharpTypeName = csharpTypeName.Replace("mssql_", "");
+            }
+
+            return csharpTypeName;
+        }
+
         public override string GetPropertyTypeName(string dbTypeName)
         {
             dbTypeName = dbTypeName.ToLower();
+            dbTypeName = GetValidCsharpTypeName(dbTypeName);
             var propertyTypes = MappingTypes.Where(it => it.Value.ToString().ToLower() == dbTypeName || it.Key.ToLower() == dbTypeName);
             if (propertyTypes == null)
             {
diff --git a/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
index 2c05866d6..a9583dd93 100644
--- a/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
+++ b/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SqlSugarCore</id>
-    <version>5.1.4.171-preview08</version>
+    <version>5.1.4.171-preview10</version>
     <authors>sunkaixuan</authors>
     <owners>果糖大数据科技</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>