Update Core

Src/Asp.Net/SqlSugar/SqlSugar.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>sqlSugar</id>
-    <version>5.0.0.1</version>
+    <version>5.0.0.2</version>
     <title>SqlSugar 5.0+  .Net Framework 4.5+ , SqlSugar 4.0+  .Net Framework 4.0+</title>
     <authors>sun kaixuan</authors>
     <owners>landa</owners>

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<IDataReader> 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<object> 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<T> result = new List<T>();
@@ -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<T> result = new List<T>();

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)
+            if (databaseDirectory.HasValue())
-            {
-                databaseDirectory = AppDomain.CurrentDomain.BaseDirectory.TrimEnd('\\').TrimEnd('/') +seChar+ "database";
-            }
-            else
             {
                 databaseDirectory = databaseDirectory.TrimEnd('\\').TrimEnd('/');
             }

Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IAdo.cs

@@ -59,7 +59,7 @@ namespace SqlSugar
         Task<IDataReader> GetDataReaderAsync(string sql, object parameters);
         Task<IDataReader> GetDataReaderAsync(string sql, params SugarParameter[] parameters);
         Task<IDataReader> GetDataReaderAsync(string sql, List<SugarParameter> parameters);
-        Task<IDataReader> GetDataReaderNoCloseAsync(string sql, params SugarParameter[] parameters);
+
 
         object GetScalar(string sql, object parameters);
         object GetScalar(string sql, params SugarParameter[] parameters);

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,

Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/SqlServer/DbMaintenance/SqlServerDbMaintenance.cs

@@ -86,31 +86,7 @@ namespace SqlSugar
         {
             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
@@ -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;
         }