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 1/9] 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 --逻辑文件 /// 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; From e85d5e07fdf1b1d98291f09c348120195f11b26d Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 08:59:22 +0800 Subject: [PATCH 2/9] Modify Demo --- Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs b/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs index 0bc6897d6..8596e2f7c 100644 --- a/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs +++ b/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs @@ -19,7 +19,7 @@ namespace OrmTest InitKeyType = InitKeyType.Attribute, IsAutoCloseConnection = true }); - db.DbMaintenance.CreateDatabase();//default bin/database + db.DbMaintenance.CreateDatabase(); db.CodeFirst.InitTables(typeof(CodeFirstTable1));//Create CodeFirstTable1 db.Insertable(new CodeFirstTable1() { Name = "a", Text="a" }).ExecuteCommand(); var list = db.Queryable().ToList(); From 6357980895c97c56daa6cb06dd68e0e7b8850c8f Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 09:05:47 +0800 Subject: [PATCH 3/9] - --- .../SqlServerTest/Demo/DemoE_CodeFirst.cs | 4 ++-- .../DbMaintenance/SqlServerDbMaintenance.cs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs b/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs index 8596e2f7c..2f8508c43 100644 --- a/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs +++ b/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs @@ -15,11 +15,11 @@ namespace OrmTest SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { DbType = DbType.SqlServer, - ConnectionString = "server=.;uid=sa;pwd=haosql;database=MyDbBaseTest", + ConnectionString = "server=.;uid=sa;pwd=haosql;database=cCcMyDbBaseTest", InitKeyType = InitKeyType.Attribute, IsAutoCloseConnection = true }); - db.DbMaintenance.CreateDatabase(); + db.DbMaintenance.CreateDatabase(@"c:\"); db.CodeFirst.InitTables(typeof(CodeFirstTable1));//Create CodeFirstTable1 db.Insertable(new CodeFirstTable1() { Name = "a", Text="a" }).ExecuteCommand(); var list = db.Queryable().ToList(); diff --git a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs index 4383279dc..8af27e9ea 100644 --- a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs +++ b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs @@ -295,13 +295,13 @@ namespace SqlSugar /// 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"); @@ -339,7 +339,7 @@ namespace SqlSugar filegrowth = 10mb ); "; } - newDb.Ado.ExecuteCommand(string.Format(CreateDataBaseSql, databaseName, databaseDirectory)); + newDb.Ado.ExecuteCommand(string.Format(sql, databaseName, databaseDirectory)); } return true; } From bab33951b3b3afe43b94f3e952c8d385f3677cbd Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 15:11:28 +0800 Subject: [PATCH 4/9] - --- .../Abstract/AdoProvider/AdoProvider.cs | 64 +------------------ Src/Asp.Net/SqlSugar/Interface/IAdo.cs | 2 +- 2 files changed, 3 insertions(+), 63 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs index ff8c04e8c..34b3225fa 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs @@ -320,36 +320,6 @@ namespace SqlSugar throw ex; } } - public virtual IDataReader GetDataReaderNoClose(string sql, params SugarParameter[] parameters) - { - try - { - InitParameters(ref sql, parameters); - if (FormatSql != null) - sql = FormatSql(sql); - SetConnectionStart(sql); - var isSp = this.CommandType == CommandType.StoredProcedure; - if (this.ProcessingEventStartingSQL != null) - ExecuteProcessingSQL(ref sql, parameters); - ExecuteBefore(sql, parameters); - IDbCommand sqlCommand = GetCommand(sql, parameters); - IDataReader sqlDataReader = sqlCommand.ExecuteReader(); - if (isSp) - DataReaderParameters = sqlCommand.Parameters; - if (this.IsClearParameters) - sqlCommand.Parameters.Clear(); - ExecuteAfter(sql, parameters); - SetConnectionEnd(sql); - return sqlDataReader; - } - catch (Exception ex) - { - CommandType = CommandType.Text; - if (ErrorEvent != null) - ExecuteErrorEvent(sql, parameters, ex); - throw ex; - } - } public virtual DataSet GetDataSetAll(string sql, params SugarParameter[] parameters) { try @@ -478,36 +448,6 @@ namespace SqlSugar throw ex; } } - public virtual async Task GetDataReaderNoCloseAsync(string sql, params SugarParameter[] parameters) - { - try - { - InitParameters(ref sql, parameters); - if (FormatSql != null) - sql = FormatSql(sql); - SetConnectionStart(sql); - var isSp = this.CommandType == CommandType.StoredProcedure; - if (this.ProcessingEventStartingSQL != null) - ExecuteProcessingSQL(ref sql, parameters); - ExecuteBefore(sql, parameters); - var sqlCommand = GetCommand(sql, parameters); - var sqlDataReader = await sqlCommand.ExecuteReaderAsync(); - if (isSp) - DataReaderParameters = sqlCommand.Parameters; - if (this.IsClearParameters) - sqlCommand.Parameters.Clear(); - ExecuteAfter(sql, parameters); - SetConnectionEnd(sql); - return sqlDataReader; - } - catch (Exception ex) - { - CommandType = CommandType.Text; - if (ErrorEvent != null) - ExecuteErrorEvent(sql, parameters, ex); - throw ex; - } - } public virtual async Task GetScalarAsync(string sql, params SugarParameter[] parameters) { try @@ -828,7 +768,7 @@ namespace SqlSugar builder.SqlQueryBuilder.sql.Append(sql); if (parsmeterArray != null && parsmeterArray.Any()) builder.SqlQueryBuilder.Parameters.AddRange(parsmeterArray); - using (var dataReader = this.GetDataReaderNoClose(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) + using (var dataReader = this.GetDataReader(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) { DbDataReader DbReader = (DbDataReader)dataReader; List result = new List(); @@ -949,7 +889,7 @@ namespace SqlSugar builder.SqlQueryBuilder.sql.Append(sql); if (parsmeterArray != null && parsmeterArray.Any()) builder.SqlQueryBuilder.Parameters.AddRange(parsmeterArray); - using (var dataReader = await this.GetDataReaderNoCloseAsync(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) + using (var dataReader = await this.GetDataReaderAsync(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) { DbDataReader DbReader = (DbDataReader)dataReader; List result = new List(); diff --git a/Src/Asp.Net/SqlSugar/Interface/IAdo.cs b/Src/Asp.Net/SqlSugar/Interface/IAdo.cs index cfc13abcf..df2cbe4e8 100644 --- a/Src/Asp.Net/SqlSugar/Interface/IAdo.cs +++ b/Src/Asp.Net/SqlSugar/Interface/IAdo.cs @@ -59,7 +59,7 @@ namespace SqlSugar Task GetDataReaderAsync(string sql, object parameters); Task GetDataReaderAsync(string sql, params SugarParameter[] parameters); Task GetDataReaderAsync(string sql, List parameters); - Task GetDataReaderNoCloseAsync(string sql, params SugarParameter[] parameters); + object GetScalar(string sql, object parameters); object GetScalar(string sql, params SugarParameter[] parameters); From 9c5ac75a2395476e21022a83899766af4a60bb22 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 15:27:50 +0800 Subject: [PATCH 5/9] 5.0.0.2 --- Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs index 40db83d5f..9a02b6dad 100644 --- a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs +++ b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.0.1")] -[assembly: AssemblyFileVersion("5.0.0.1")] +[assembly: AssemblyVersion("5.0.0.2")] +[assembly: AssemblyFileVersion("5.0.0.2")] From e4e6c6c8df13c0a5d9b0d65bf3422752fc3dcef0 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 15:42:54 +0800 Subject: [PATCH 6/9] Update Core --- Src/Asp.Net/SqlSugar/SqlSugar.nuspec | 2 +- .../Abstract/AdoProvider/AdoProvider.cs | 64 +------------------ .../Abstract/DbMaintenanceProvider/Methods.cs | 6 +- .../SqlSeverTest/SqlSugar/Interface/IAdo.cs | 2 +- .../MySql/DbMaintenance/MySqlDbMaintenance.cs | 2 +- .../DbMaintenance/SqlServerDbMaintenance.cs | 55 ++++++++-------- 6 files changed, 35 insertions(+), 96 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.nuspec b/Src/Asp.Net/SqlSugar/SqlSugar.nuspec index d734a1f5a..389d1080e 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugar.nuspec +++ b/Src/Asp.Net/SqlSugar/SqlSugar.nuspec @@ -2,7 +2,7 @@ sqlSugar - 5.0.0.1 + 5.0.0.2 SqlSugar 5.0+ .Net Framework 4.5+ , SqlSugar 4.0+ .Net Framework 4.0+ sun kaixuan landa diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs index ff8c04e8c..34b3225fa 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs @@ -320,36 +320,6 @@ namespace SqlSugar throw ex; } } - public virtual IDataReader GetDataReaderNoClose(string sql, params SugarParameter[] parameters) - { - try - { - InitParameters(ref sql, parameters); - if (FormatSql != null) - sql = FormatSql(sql); - SetConnectionStart(sql); - var isSp = this.CommandType == CommandType.StoredProcedure; - if (this.ProcessingEventStartingSQL != null) - ExecuteProcessingSQL(ref sql, parameters); - ExecuteBefore(sql, parameters); - IDbCommand sqlCommand = GetCommand(sql, parameters); - IDataReader sqlDataReader = sqlCommand.ExecuteReader(); - if (isSp) - DataReaderParameters = sqlCommand.Parameters; - if (this.IsClearParameters) - sqlCommand.Parameters.Clear(); - ExecuteAfter(sql, parameters); - SetConnectionEnd(sql); - return sqlDataReader; - } - catch (Exception ex) - { - CommandType = CommandType.Text; - if (ErrorEvent != null) - ExecuteErrorEvent(sql, parameters, ex); - throw ex; - } - } public virtual DataSet GetDataSetAll(string sql, params SugarParameter[] parameters) { try @@ -478,36 +448,6 @@ namespace SqlSugar throw ex; } } - public virtual async Task GetDataReaderNoCloseAsync(string sql, params SugarParameter[] parameters) - { - try - { - InitParameters(ref sql, parameters); - if (FormatSql != null) - sql = FormatSql(sql); - SetConnectionStart(sql); - var isSp = this.CommandType == CommandType.StoredProcedure; - if (this.ProcessingEventStartingSQL != null) - ExecuteProcessingSQL(ref sql, parameters); - ExecuteBefore(sql, parameters); - var sqlCommand = GetCommand(sql, parameters); - var sqlDataReader = await sqlCommand.ExecuteReaderAsync(); - if (isSp) - DataReaderParameters = sqlCommand.Parameters; - if (this.IsClearParameters) - sqlCommand.Parameters.Clear(); - ExecuteAfter(sql, parameters); - SetConnectionEnd(sql); - return sqlDataReader; - } - catch (Exception ex) - { - CommandType = CommandType.Text; - if (ErrorEvent != null) - ExecuteErrorEvent(sql, parameters, ex); - throw ex; - } - } public virtual async Task GetScalarAsync(string sql, params SugarParameter[] parameters) { try @@ -828,7 +768,7 @@ namespace SqlSugar builder.SqlQueryBuilder.sql.Append(sql); if (parsmeterArray != null && parsmeterArray.Any()) builder.SqlQueryBuilder.Parameters.AddRange(parsmeterArray); - using (var dataReader = this.GetDataReaderNoClose(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) + using (var dataReader = this.GetDataReader(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) { DbDataReader DbReader = (DbDataReader)dataReader; List result = new List(); @@ -949,7 +889,7 @@ namespace SqlSugar builder.SqlQueryBuilder.sql.Append(sql); if (parsmeterArray != null && parsmeterArray.Any()) builder.SqlQueryBuilder.Parameters.AddRange(parsmeterArray); - using (var dataReader = await this.GetDataReaderNoCloseAsync(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) + using (var dataReader = await this.GetDataReaderAsync(builder.SqlQueryBuilder.ToSqlString(), builder.SqlQueryBuilder.Parameters.ToArray())) { DbDataReader DbReader = (DbDataReader)dataReader; List result = new List(); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs index ef51f3587..d6d61670b 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/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.NetCore2/SqlSeverTest/SqlSugar/Interface/IAdo.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IAdo.cs index cfc13abcf..df2cbe4e8 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IAdo.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IAdo.cs @@ -59,7 +59,7 @@ namespace SqlSugar Task GetDataReaderAsync(string sql, object parameters); Task GetDataReaderAsync(string sql, params SugarParameter[] parameters); Task GetDataReaderAsync(string sql, List parameters); - Task GetDataReaderNoCloseAsync(string sql, params SugarParameter[] parameters); + object GetScalar(string sql, object parameters); object GetScalar(string sql, params SugarParameter[] parameters); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs index 45c55a8c7..adcaac3a2 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs @@ -264,7 +264,7 @@ namespace SqlSugar } var oldDatabaseName = this.Context.Ado.Connection.Database; var connection = this.Context.CurrentConnectionConfig.ConnectionString; - connection = connection.Replace(oldDatabaseName, "sys"); + connection = connection.Replace(oldDatabaseName, "mysql"); var newDb = new SqlSugarClient(new ConnectionConfig() { DbType = this.Context.CurrentConnectionConfig.DbType, diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs index 75ffa280f..8af27e9ea 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/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 @@ -336,7 +312,34 @@ log on --逻辑文件 }); if (!GetDataBaseList(newDb).Any(it => it.Equals(databaseName, StringComparison.CurrentCultureIgnoreCase))) { - newDb.Ado.ExecuteCommand(string.Format(CreateDataBaseSql, databaseName, databaseDirectory)); + 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(sql, databaseName, databaseDirectory)); } return true; } From f5c4187bf9194dbd75aab64adb85b3ac5d0512c8 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 15:43:33 +0800 Subject: [PATCH 7/9] - --- .../Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.Net/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs index 45c55a8c7..adcaac3a2 100644 --- a/Src/Asp.Net/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs +++ b/Src/Asp.Net/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs @@ -264,7 +264,7 @@ namespace SqlSugar } var oldDatabaseName = this.Context.Ado.Connection.Database; var connection = this.Context.CurrentConnectionConfig.ConnectionString; - connection = connection.Replace(oldDatabaseName, "sys"); + connection = connection.Replace(oldDatabaseName, "mysql"); var newDb = new SqlSugarClient(new ConnectionConfig() { DbType = this.Context.CurrentConnectionConfig.DbType, From 950a4baa6713e67ab0413fde87d355613051d150 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 15:44:22 +0800 Subject: [PATCH 8/9] 5.0.0.2 --- Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugar.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugar.csproj b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugar.csproj index d853e0366..02a8b515c 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugar.csproj +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugar.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 5.0.0.1 + 5.0.0.2 sun_kai_xuan https://github.com/sunkaixuan/SqlSugar From b1931834e69325155e4c2212fdd5d091997fb19f Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 May 2019 15:46:08 +0800 Subject: [PATCH 9/9] 5.0.0.2 --- Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarForCore.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarForCore.nuspec index 889bb51f5..c68cd9f87 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarForCore.nuspec +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarForCore.nuspec @@ -2,7 +2,7 @@ sqlSugarCore - 5.0.0.1 + 5.0.0.2 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html