From 97375f5d1eb4303c98402999ae85670e3019a5b3 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Sat, 23 Apr 2022 20:50:19 +0800
Subject: [PATCH] Update  CodeFirst

---
 Src/Asp.Net/SqlServerTest/UnitTest/UCodeFirst.cs   | 14 ++++++++++++++
 .../DbMaintenance/SqlServerDbMaintenance.cs        |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UCodeFirst.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UCodeFirst.cs
index decb5367d..88e3d1eb9 100644
--- a/Src/Asp.Net/SqlServerTest/UnitTest/UCodeFirst.cs
+++ b/Src/Asp.Net/SqlServerTest/UnitTest/UCodeFirst.cs
@@ -44,6 +44,14 @@ namespace OrmTest
             catch  
             { 
             }
+
+            try
+            {
+                Db.Ado.ExecuteCommand(@" create schema [user]");
+            }
+            catch
+            {
+            }
             db.CodeFirst.InitTables<UnitTableName>();
             db.CodeFirst.InitTables<UnitGe>();
             db.Insertable(new UnitGe() { geometry1 = "POINT (20 180)" }).ExecuteCommand();
@@ -58,6 +66,7 @@ namespace OrmTest
             Db.Insertable(new UnitCodeFirst131() { Id = 1 }).ExecuteCommand();
             Db.CodeFirst.InitTables<UNITCODEFIRST131>();
             Db.CodeFirst.InitTables<UNITCOdEFIRST131>();
+            Db.CodeFirst.InitTables<UnitTableUserName>();
         }
         public class UnitCodeFirst131
         {
@@ -107,6 +116,11 @@ namespace OrmTest
             public TimeSpan Id { get; set; }
             public TimeSpan id2 { get; set; }
         }
+        [SugarTable("user.UnitTableUserName", "备注")]
+        public class UnitTableUserName
+        {
+            public string Id { get; set; }
+        }
         public class UnitTest0122132
         {
 
diff --git a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
index fde44844a..2d55d4e4d 100644
--- a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
@@ -359,7 +359,14 @@ namespace SqlSugar
                 if (schemas.Any(y => y.EqualCase(tableSchemas))) 
                 {
                     sql = string.Format(this.AddTableRemarkSql, this.SqlBuilder.GetNoTranslationColumnName(tableName.Split('.').Last()), description);
-                    sql = sql.Replace("N'dbo'", $"N'{tableSchemas}'").Replace("N'user'", "N'SCHEMA'");
+                    if (tableSchemas.EqualCase("user"))
+                    {
+                        sql = sql.Replace("N'user', N'dbo'", $"N'user', '{tableSchemas}'").Replace("N'user'", "N'SCHEMA'");
+                    }
+                    else
+                    {
+                        sql = sql.Replace("N'dbo'", $"N'{tableSchemas}'").Replace("N'user'", "N'SCHEMA'");
+                    }
                 }
             }
             this.Context.Ado.ExecuteCommand(sql);