Modify create database

This commit is contained in:
sunkaixuan 2019-05-23 08:57:18 +08:00
parent bbf6f0b13e
commit 802cb6f33b
2 changed files with 36 additions and 37 deletions

View File

@ -146,11 +146,7 @@ namespace SqlSugar
public virtual bool CreateDatabase(string databaseDirectory = null) public virtual bool CreateDatabase(string databaseDirectory = null)
{ {
var seChar = Path.DirectorySeparatorChar.ToString(); var seChar = Path.DirectorySeparatorChar.ToString();
if (databaseDirectory == null) if (databaseDirectory.HasValue())
{
databaseDirectory = AppDomain.CurrentDomain.BaseDirectory.TrimEnd('\\').TrimEnd('/') +seChar+ "database";
}
else
{ {
databaseDirectory = databaseDirectory.TrimEnd('\\').TrimEnd('/'); databaseDirectory = databaseDirectory.TrimEnd('\\').TrimEnd('/');
} }

View File

@ -86,31 +86,7 @@ namespace SqlSugar
{ {
get get
{ {
return @" return @"create database {0} ";
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
);";
} }
} }
protected override string AddPrimaryKeySql protected override string AddPrimaryKeySql
@ -319,13 +295,13 @@ log on --逻辑文件
/// <returns></returns> /// <returns></returns>
public override bool CreateDatabase(string databaseName, string databaseDirectory = null) public override bool CreateDatabase(string databaseName, string databaseDirectory = null)
{ {
if (databaseDirectory != null) //if (databaseDirectory != null)
{ //{
if (!FileHelper.IsExistDirectory(databaseDirectory)) // if (!FileHelper.IsExistDirectory(databaseDirectory))
{ // {
FileHelper.CreateDirectory(databaseDirectory); // FileHelper.CreateDirectory(databaseDirectory);
} // }
} //}
var oldDatabaseName = this.Context.Ado.Connection.Database; var oldDatabaseName = this.Context.Ado.Connection.Database;
var connection = this.Context.CurrentConnectionConfig.ConnectionString; var connection = this.Context.CurrentConnectionConfig.ConnectionString;
connection = connection.Replace(oldDatabaseName, "master"); connection = connection.Replace(oldDatabaseName, "master");
@ -336,6 +312,33 @@ log on --逻辑文件
}); });
if (!GetDataBaseList(newDb).Any(it => it.Equals(databaseName, StringComparison.CurrentCultureIgnoreCase))) 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)); newDb.Ado.ExecuteCommand(string.Format(CreateDataBaseSql, databaseName, databaseDirectory));
} }
return true; return true;