From 5c32ae7e94323181fa57ac0c08ed2481e2439dd5 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Fri, 17 Jun 2022 14:48:34 +0800
Subject: [PATCH] Update  .net  core project

---
 .../SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs | 10 +++++-----
 .../Abstract/QueryableProvider/QueryableProvider.cs    |  2 +-
 .../Abstract/SugarProvider/SqlSugarAccessory.cs        |  3 +++
 Src/Asp.NetCore2/SqlSugar/Enum/DbType.cs               |  3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
index 31ae780a9..c45834d77 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
@@ -15,7 +15,7 @@ namespace SqlSugar
         }
         public virtual List<DbTableInfo> GetViewInfoList(bool isCache = true)
         {
-            string cacheKey = "DbMaintenanceProvider.GetViewInfoList";
+            string cacheKey = "DbMaintenanceProvider.GetViewInfoList" + this.Context.CurrentConnectionConfig.ConfigId;
             cacheKey = GetCacheKey(cacheKey);
             var result = new List<DbTableInfo>();
             if (isCache)
@@ -30,7 +30,7 @@ namespace SqlSugar
         }
         public virtual List<DbTableInfo> GetTableInfoList(bool isCache = true)
         {
-            string cacheKey = "DbMaintenanceProvider.GetTableInfoList";
+            string cacheKey = "DbMaintenanceProvider.GetTableInfoList"+this.Context.CurrentConnectionConfig.ConfigId;
             cacheKey = GetCacheKey(cacheKey);
             var result = new List<DbTableInfo>();
             if (isCache)
@@ -46,7 +46,7 @@ namespace SqlSugar
         public virtual List<DbColumnInfo> GetColumnInfosByTableName(string tableName, bool isCache = true)
         {
             if (string.IsNullOrEmpty(tableName)) return new List<DbColumnInfo>();
-            string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            string cacheKey = "DbMaintenanceProvider.GetColumnInfosByTableName." + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower() + this.Context.CurrentConnectionConfig.ConfigId;
             cacheKey = GetCacheKey(cacheKey);
             var sql = string.Format(this.GetColumnInfosByTableNameSql, tableName);
             if (isCache)
@@ -57,7 +57,7 @@ namespace SqlSugar
         }
         public virtual List<string> GetIsIdentities(string tableName)
         {
-            string cacheKey = "DbMaintenanceProvider.GetIsIdentities" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            string cacheKey = "DbMaintenanceProvider.GetIsIdentities" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower() + this.Context.CurrentConnectionConfig.ConfigId;
             cacheKey = GetCacheKey(cacheKey);
             return this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey, () =>
                      {
@@ -67,7 +67,7 @@ namespace SqlSugar
         }
         public virtual List<string> GetPrimaries(string tableName)
         {
-            string cacheKey = "DbMaintenanceProvider.GetPrimaries" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower();
+            string cacheKey = "DbMaintenanceProvider.GetPrimaries" + this.SqlBuilder.GetNoTranslationColumnName(tableName).ToLower() + this.Context.CurrentConnectionConfig.ConfigId;
             cacheKey = GetCacheKey(cacheKey);
             return this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate(cacheKey, () =>
              {
diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
index 38ba3c9c8..a83fb2a18 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
@@ -2422,7 +2422,7 @@ namespace SqlSugar
                 if (this.QueryBuilder.AsTables != null && this.QueryBuilder.AsTables.Count==1) 
                 {
                     var tableinfo = this.QueryBuilder.AsTables.First();
-                    if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsWithNoLockQuery == true)
+                    if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsWithNoLockQuery == true&& this.QueryBuilder.AsTables.First().Value.ObjToString().Contains(SqlWith.NoLock) ==false)
                     {
                         this.QueryBuilder.AsTables[tableinfo.Key] = " (SELECT * FROM " + this.QueryBuilder.AsTables.First().Value + $" {SqlWith.NoLock} )";
                     }
diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs
index 71993431d..d7e970c13 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs
@@ -381,6 +381,9 @@ namespace SqlSugar
                 case DbType.PostgreSQL:
                     DependencyManagement.TryPostgreSQL();
                     break;
+                case DbType.OpenGauss:
+                    Check.ExceptionEasy("Use DbType.PostgreSQL , ConnectionString add No Reset On Close=true", "OpenGausso数据库可以使用DbType.PostgreSQL 并且连接字符串加上 No Reset On Close=true");
+                    break;
                 case DbType.Kdbndp:
                     DependencyManagement.TryKdbndb();
                     break;
diff --git a/Src/Asp.NetCore2/SqlSugar/Enum/DbType.cs b/Src/Asp.NetCore2/SqlSugar/Enum/DbType.cs
index b69d5140e..f8cc764a3 100644
--- a/Src/Asp.NetCore2/SqlSugar/Enum/DbType.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Enum/DbType.cs
@@ -17,6 +17,7 @@ namespace SqlSugar
         Oscar,
         MySqlConnector,
         Access,
-        Custom=900
+        OpenGauss,
+        Custom =900
     }
 }