diff --git a/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs b/Src/Asp.Net/SqlServerTest/Demo/DemoE_CodeFirst.cs index 0bc6897d6..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();//default bin/database + 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/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/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/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); 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")] diff --git a/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs index 75ffa280f..8af27e9ea 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 @@ -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; } 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; } 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 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