From 802cb6f33b41a2f580b30b04ec114d368192ba9a Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Thu, 23 May 2019 08:57:18 +0800
Subject: [PATCH] Modify create database

---
 .../Abstract/DbMaintenanceProvider/Methods.cs |  6 +-
 .../DbMaintenance/SqlServerDbMaintenance.cs   | 67 ++++++++++---------
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs b/Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
index ef51f3587..d6d61670b 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs
@@ -146,11 +146,7 @@ namespace SqlSugar
         public virtual bool CreateDatabase(string databaseDirectory = null)
         {
             var seChar = Path.DirectorySeparatorChar.ToString();
-            if (databaseDirectory == null)
-            {
-                databaseDirectory = AppDomain.CurrentDomain.BaseDirectory.TrimEnd('\\').TrimEnd('/') +seChar+ "database";
-            }
-            else
+            if (databaseDirectory.HasValue())
             {
                 databaseDirectory = databaseDirectory.TrimEnd('\\').TrimEnd('/');
             }
diff --git a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
index 75ffa280f..4383279dc 100644
--- a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs
@@ -86,31 +86,7 @@ namespace SqlSugar
         {
             get
             {
-                return @"
-create database {0}  
-on primary 
-(
-    name = N'{0}',
-    filename=N'{1}\{0}.mdf',
-    size=10mb,
-    maxsize=100mb,
-    filegrowth=1mb
-),
-(
-    name=N'{0}_ndf',   
-    filename=N'{1}\{0}.ndf',
-    size=10mb,
-    maxsize=100mb,
-     filegrowth=10%
-)
-log on  --逻辑文件
-(
-    name=N'{0}_log',  
-    filename=N'{1}\{0}.ldf', 
-    size=100mb,
-    maxsize=1gb,
-    filegrowth=10mb
-);";
+                return @"create database {0}  ";
             }
         }
         protected override string AddPrimaryKeySql
@@ -319,13 +295,13 @@ log on  --逻辑文件
         /// <returns></returns>
         public override bool CreateDatabase(string databaseName, string databaseDirectory = null)
         {
-            if (databaseDirectory != null)
-            {
-                if (!FileHelper.IsExistDirectory(databaseDirectory))
-                {
-                    FileHelper.CreateDirectory(databaseDirectory);
-                }
-            }
+            //if (databaseDirectory != null)
+            //{
+            //    if (!FileHelper.IsExistDirectory(databaseDirectory))
+            //    {
+            //        FileHelper.CreateDirectory(databaseDirectory);
+            //    }
+            //}
             var oldDatabaseName = this.Context.Ado.Connection.Database;
             var connection = this.Context.CurrentConnectionConfig.ConnectionString;
             connection = connection.Replace(oldDatabaseName, "master");
@@ -336,6 +312,33 @@ log on  --逻辑文件
             });
             if (!GetDataBaseList(newDb).Any(it => it.Equals(databaseName, StringComparison.CurrentCultureIgnoreCase)))
             {
+                var sql = CreateDataBaseSql;
+                if (databaseDirectory.HasValue())
+                {
+                    sql += @"on primary 
+                                        (
+                                            name = N'{0}',
+                                            filename = N'{1}\{0}.mdf',
+                                            size = 10mb,
+                                            maxsize = 100mb,
+                                            filegrowth = 1mb
+                                        ),
+                                        (
+                                            name = N'{0}_ndf',   
+                                            filename = N'{1}\{0}.ndf',
+                                            size = 10mb,
+                                            maxsize = 100mb,
+                                             filegrowth = 10 %
+                                        )
+                                        log on  --逻辑文件
+                                        (
+                                            name = N'{0}_log',
+                                            filename = N'{1}\{0}.ldf',
+                                            size = 100mb,
+                                            maxsize = 1gb,
+                                            filegrowth = 10mb
+                                        ); ";
+                }
                 newDb.Ado.ExecuteCommand(string.Format(CreateDataBaseSql, databaseName, databaseDirectory));
             }
             return true;