- 增加 IInsert/IUpdate BatchProgress 方法处理批量插入/更新时的进度；

FreeSql.Tests/FreeSql.Tests/UnitTest3.cs

@@ -433,8 +433,12 @@ namespace FreeSql.Tests
                     new SendInfo{ Code = "002", Binary = Encoding.UTF8.GetBytes("我是地球人") },
                     new SendInfo{ Code = "003", Binary = Encoding.UTF8.GetBytes("我是.net")},
                     new SendInfo{ Code = "004", Binary = Encoding.UTF8.GetBytes("我是freesql") },
+                    new SendInfo{ Code = "005", Binary = Encoding.UTF8.GetBytes("我是freesql233") },
                 })
-                .NoneParameter().ExecuteAffrows();
+                .NoneParameter()
+                .BatchOptions(3, 200)
+                .BatchProgress(a => Trace.WriteLine($"{a.Current}/{a.Total}"))
+                .ExecuteAffrows();
 
             var slslsl = g.oracle.Select<SendInfo>().ToList();
 

FreeSql/FreeSql.xml

@@ -1069,11 +1069,18 @@
             Sqlite 5000 999<para></para>
             若没有事务传入，内部(默认)会自动开启新事务，保证拆包执行的完整性。
             </summary>
-            <param name="valuesLimit">指定根据 values 数量拆分执行</param>
+            <param name="valuesLimit">指定根据 values 上限数量拆分执行</param>
-            <param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
+            <param name="parameterLimit">指定根据 parameters 上限数量拆分执行</param>
             <param name="autoTransaction">是否自动开启事务</param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IInsert`1.BatchProgress(System.Action{FreeSql.Internal.Model.BatchProgressStatus{`0}})">
+            <summary>
+            批量执行时，分批次执行的进度状态
+            </summary>
+            <param name="callback">批量执行时的回调委托</param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IInsert`1.AsTable(System.Func{System.String,System.String})">
             <summary>
             设置表名规则，可用于分库/分表，参数1：默认表名；返回值：新表名；
@@ -2142,11 +2149,18 @@
             Sqlite 200 999<para></para>
             若没有事务传入，内部(默认)会自动开启新事务，保证拆包执行的完整性。
             </summary>
-            <param name="rowsLimit">指定根据 rows 数量拆分执行</param>
+            <param name="rowsLimit">指定根据 rows 上限数量拆分执行</param>
-            <param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
+            <param name="parameterLimit">指定根据 parameters 上限数量拆分执行</param>
             <param name="autoTransaction">是否自动开启事务</param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IUpdate`1.BatchProgress(System.Action{FreeSql.Internal.Model.BatchProgressStatus{`0}})">
+            <summary>
+            批量执行时，分批次执行的进度状态
+            </summary>
+            <param name="callback">批量执行时的回调委托</param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IUpdate`1.SetSource(`0)">
             <summary>
             更新数据，设置更新的实体
@@ -2919,89 +2933,104 @@
             转大写同步结构，适用 Oracle/达梦/人大金仓
             </summary>
         </member>
-        <member name="P:FreeSql.ICodeFirst.IsConfigEntityFromDbFirst">
+        <member name="P:Fre        获取c#类型，int、long
-            <summary>
-            将数据库的主键、自增、索引设置导入，适用 DbFirst 模式，无须在实体类型上设置 [Column(IsPrimary)] 或者 ConfigEntity。此功能目前可用于 mysql/sqlserver/postgresql/oracle。<para></para>
-            本功能会影响 IFreeSql 首次访问的速度。<para></para>
-            若使用 CodeFirst 创建索引后，又直接在数据库上建了索引，若无本功能下一次 CodeFirst 迁移时数据库上创建的索引将被删除
             </summary>
-        </member>
+            <param name="column"></param>
-        <member name="P:FreeSql.ICodeFirst.IsNoneCommandParameter">
-            <summary>
-            不使用命令参数化执行，针对 Insert/Update
-            </summary>
-        </member>
-        <member name="P:FreeSql.ICodeFirst.IsGenerateCommandParameterWithLambda">
-            <summary>
-            是否生成命令参数化执行，针对 lambda 表达式解析<para></para>
-            注意：常量不会参数化，变量才会做参数化<para></para>
-            var id = 100;
-            fsql.Select&lt;T&gt;().Where(a => a.id == id) 会参数化<para></para>
-            fsql.Select&lt;T&gt;().Where(a => a.id == 100) 不会参数化
-            </summary>
-        </member>
-        <member name="P:FreeSql.ICodeFirst.IsLazyLoading">
-            <summary>
-            延时加载导航属性对象，导航属性需要声明 virtual
-            </summary>
-        </member>
-        <member name="M:FreeSql.ICodeFirst.GetComparisonDDLStatements``1">
-            <summary>
-            将实体类型与数据库对比，返回DDL语句
-            </summary>
-            <typeparam name="TEntity"></typeparam>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.GetComparisonDDLStatements(System.Type[])">
+        <member name="M:FreeSql.IDbFirst.GetCsTypeInfo(FreeSql.DatabaseModel.DbColumnInfo)">
             <summary>
-            将实体类型集合与数据库对比，返回DDL语句
+            获取c#类型对象
             </summary>
-            <param name="entityTypes">实体类型</param>
+            <param name="column"></param>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.GetComparisonDDLStatements(System.Type,System.String)">
+        <member name="M:FreeSql.IDbFirst.GetDataReaderMethod(FreeSql.DatabaseModel.DbColumnInfo)">
             <summary>
-            将实体类型与数据库对比，返回DDL语句（指定表名）
+            获取ado.net读取方法, GetBoolean、GetInt64
             </summary>
-            <param name="entityType">实体类型</param>
+            <param name="column"></param>
-            <param name="tableName">指定表名对比</param>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.SyncStructure``1">
+        <member name="M:FreeSql.IDbFirst.GetCsStringify(FreeSql.DatabaseModel.DbColumnInfo)">
             <summary>
-            同步实体类型到数据库<para></para>
+            序列化
-            注意：生产环境中谨慎使用
             </summary>
-            <typeparam name="TEntity"></typeparam>
+            <param name="column"></param>
+            <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.SyncStructure(System.Type[])">
+        <member name="M:FreeSql.IDbFirst.GetCsParse(FreeSql.DatabaseModel.DbColumnInfo)">
             <summary>
-            同步实体类型集合到数据库<para></para>
+            反序列化
-            注意：生产环境中谨慎使用
             </summary>
-            <param name="entityTypes"></param>
+            <param name="column"></param>
+            <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.SyncStructure(System.Type,System.String)">
+        <member name="M:FreeSql.IDbFirst.GetEnumsByDatabase(System.String[])">
             <summary>
-            同步实体类型到数据库（指定表名）<para></para>
+            获取数据库枚举类型，适用 PostgreSQL
-            注意：生产环境中谨慎使用
             </summary>
-            <param name="entityType">实体类型</param>
+            <param name="database"></param>
-            <param name="tableName">指定表名对比</param>
+            <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.GetDbInfo(System.Type)">
+        <member name="M:FreeSql.Internal.CommonProvider.InsertOrUpdateProvider`1.SplitSourceByIdentityValueIsNull(System.Collections.Generic.List{`0})">
             <summary>
-            根据 System.Type 获取数据库信息
+            如果实体类有自增属性，分成两个 List，有值的Item1 merge，无值的Item2 insert
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Internal.CommonProvider.InsertProvider`1.IgnoreCanInsert">
+            <summary>
+            AsType, Ctor, ClearData 三处地方需要重新加载
+            </summary>
+        </member>
+        <member name="M:FreeSql.Internal.CommonProvider.UpdateProvider`1.IgnoreCanUpdate">
+            <summary>
+            AsType, Ctor, ClearData 三处地方需要重新加载
+            </summary>
+        </member>
+        <member name="M:FreeSql.Internal.CommonUtils.GetPropertyCommentByDescriptionAttribute(System.Type)">
+            <summary>
+            动态读取 DescriptionAttribute 注释文本
             </summary>
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.ICodeFirst.ConfigEntity``1(System.Action{FreeSql.DataAnnotations.TableFluent{``0}})">
+        <member name="M:FreeSql.Internal.CommonUtils.GetProperyCommentBySummary(System.Type)">
             <summary>
-            FreeSql FluentApi 配置实体，方法名与特性相同
+            通过属性的注释文本，通过 xml 读取
             </summary>
-            <typeparam name="T"></typeparam>
+            <param name="type"></param>
-            <param name="entity"></param>
+            <returns>Dict：key=属性名，value=注释</returns>
+        </member>
+        <member name="M:FreeSql.Internal.GlobalFilter.Apply``1(System.String,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
+            <summary>
+            创建一个过滤器
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+            <param name="name">名字</param>
+            <param name="where">表达式</param>
+            <returns></returns>
+        </member>
+        <member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Data">
+            <summary>
+            当前操作的数据
+            </summary>
+        </member>
+        <member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Current">
+            <summary>
+            当前批次
+            </summary>
+        </member>
+        <member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Total">
+            <summary>
+            总批次数量
+            </summary>
+        </member>
+        <member name="T:FreeSql.Internal.Model.DynamicFilterInfo">
+            <summary>
+            <20><>me="entity"></param>
             <returns></returns>
         </member>
         <member name="M:FreeSql.ICodeFirst.ConfigEntity(System.Type,System.Action{FreeSql.DataAnnotations.TableFluent})">
@@ -3142,6 +3171,21 @@
             <param name="where">表达式</param>
             <returns></returns>
         </member>
+        <member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Data">
+            <summary>
+            当前操作的数据
+            </summary>
+        </member>
+        <member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Current">
+            <summary>
+            当前批次
+            </summary>
+        </member>
+        <member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Total">
+            <summary>
+            总批次数量
+            </summary>
+        </member>
         <member name="T:FreeSql.Internal.Model.DynamicFilterInfo">
             <summary>
             动态过滤条件

FreeSql/Interface/Curd/IInsert.cs

@@ -1,4 +1,5 @@
-using System;
+using FreeSql.Internal.Model;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
@@ -91,12 +92,19 @@ namespace FreeSql
         /// Sqlite 5000 999<para></para>
         /// 若没有事务传入，内部(默认)会自动开启新事务，保证拆包执行的完整性。
         /// </summary>
-        /// <param name="valuesLimit">指定根据 values 数量拆分执行</param>
+        /// <param name="valuesLimit">指定根据 values 上限数量拆分执行</param>
-        /// <param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
+        /// <param name="parameterLimit">指定根据 parameters 上限数量拆分执行</param>
         /// <param name="autoTransaction">是否自动开启事务</param>
         /// <returns></returns>
         IInsert<T1> BatchOptions(int valuesLimit, int parameterLimit, bool autoTransaction = true);
 
+        /// <summary>
+        /// 批量执行时，分批次执行的进度状态
+        /// </summary>
+        /// <param name="callback">批量执行时的回调委托</param>
+        /// <returns></returns>
+        IInsert<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback);
+
         /// <summary>
         /// 设置表名规则，可用于分库/分表，参数1：默认表名；返回值：新表名；
         /// </summary>

FreeSql/Interface/Curd/IUpdate.cs

@@ -1,4 +1,5 @@
-using System;
+using FreeSql.Internal.Model;
+using System;
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq.Expressions;
@@ -39,12 +40,19 @@ namespace FreeSql
         /// Sqlite 200 999<para></para>
         /// 若没有事务传入，内部(默认)会自动开启新事务，保证拆包执行的完整性。
         /// </summary>
-        /// <param name="rowsLimit">指定根据 rows 数量拆分执行</param>
+        /// <param name="rowsLimit">指定根据 rows 上限数量拆分执行</param>
-        /// <param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
+        /// <param name="parameterLimit">指定根据 parameters 上限数量拆分执行</param>
         /// <param name="autoTransaction">是否自动开启事务</param>
         /// <returns></returns>
         IUpdate<T1> BatchOptions(int rowsLimit, int parameterLimit, bool autoTransaction = true);
 
+        /// <summary>
+        /// 批量执行时，分批次执行的进度状态
+        /// </summary>
+        /// <param name="callback">批量执行时的回调委托</param>
+        /// <returns></returns>
+        IUpdate<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback);
+
         /// <summary>
         /// 更新数据，设置更新的实体
         /// </summary>

FreeSql/Internal/CommonProvider/InsertProvider.cs

@@ -26,6 +26,7 @@ namespace FreeSql.Internal.CommonProvider
         public bool _noneParameter, _insertIdentity;
         public int _batchValuesLimit, _batchParameterLimit;
         public bool _batchAutoTransaction = true;
+        public Action<BatchProgressStatus<T1>> _batchProgress;
         public DbParameter[] _params;
         public DbTransaction _transaction;
         public DbConnection _connection;
@@ -55,6 +56,7 @@ namespace FreeSql.Internal.CommonProvider
         {
             _batchValuesLimit = _batchParameterLimit = 0;
             _batchAutoTransaction = true;
+            _batchProgress = null;
             _insertIdentity = false;
             _source.Clear();
             _ignore.Clear();
@@ -96,6 +98,12 @@ namespace FreeSql.Internal.CommonProvider
             return this;
         }
 
+        public IInsert<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback)
+        {
+            _batchProgress = callback;
+            return this;
+        }
+
         public IInsert<T1> AppendData(T1 source)
         {
             if (source != null)
@@ -204,6 +212,7 @@ namespace FreeSql.Internal.CommonProvider
             }
             if (ss.Length == 1)
             {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
                 ret = this.RawExecuteAffrows();
                 ClearData();
                 return ret;
@@ -221,6 +230,7 @@ namespace FreeSql.Internal.CommonProvider
                     for (var a = 0; a < ss.Length; a++)
                     {
                         _source = ss[a];
+                        _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                         ret += this.RawExecuteAffrows();
                     }
                 }
@@ -236,6 +246,7 @@ namespace FreeSql.Internal.CommonProvider
                             for (var a = 0; a < ss.Length; a++)
                             {
                                 _source = ss[a];
+                                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                                 ret += this.RawExecuteAffrows();
                             }
                             _transaction.Commit();
@@ -276,6 +287,7 @@ namespace FreeSql.Internal.CommonProvider
             }
             if (ss.Length == 1)
             {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
                 ret = this.RawExecuteIdentity();
                 ClearData();
                 return ret;
@@ -293,6 +305,7 @@ namespace FreeSql.Internal.CommonProvider
                     for (var a = 0; a < ss.Length; a++)
                     {
                         _source = ss[a];
+                        _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                         if (a < ss.Length - 1) this.RawExecuteAffrows();
                         else ret = this.RawExecuteIdentity();
                     }
@@ -309,6 +322,7 @@ namespace FreeSql.Internal.CommonProvider
                             for (var a = 0; a < ss.Length; a++)
                             {
                                 _source = ss[a];
+                                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                                 if (a < ss.Length - 1) this.RawExecuteAffrows();
                                 else ret = this.RawExecuteIdentity();
                             }
@@ -350,6 +364,7 @@ namespace FreeSql.Internal.CommonProvider
             }
             if (ss.Length == 1)
             {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
                 ret = this.RawExecuteInserted();
                 ClearData();
                 return ret;
@@ -367,6 +382,7 @@ namespace FreeSql.Internal.CommonProvider
                     for (var a = 0; a < ss.Length; a++)
                     {
                         _source = ss[a];
+                        _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                         ret.AddRange(this.RawExecuteInserted());
                     }
                 }
@@ -382,6 +398,7 @@ namespace FreeSql.Internal.CommonProvider
                             for (var a = 0; a < ss.Length; a++)
                             {
                                 _source = ss[a];
+                                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                                 ret.AddRange(this.RawExecuteInserted());
                             }
                             _transaction.Commit();

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -32,6 +32,7 @@ namespace FreeSql.Internal.CommonProvider
         public bool _noneParameter;
         public int _batchRowsLimit, _batchParameterLimit;
         public bool _batchAutoTransaction = true;
+        public Action<BatchProgressStatus<T1>> _batchProgress;
         public DbTransaction _transaction;
         public DbConnection _connection;
 
@@ -101,6 +102,12 @@ namespace FreeSql.Internal.CommonProvider
             return this;
         }
 
+        public IUpdate<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback)
+        {
+            _batchProgress = callback;
+            return this;
+        }
+
         protected void ValidateVersionAndThrow(int affrows)
         {
             if (_table.VersionColumn != null && _source.Count > 0)
@@ -144,6 +151,7 @@ namespace FreeSql.Internal.CommonProvider
             var ret = 0;
             if (ss.Length <= 1)
             {
+                if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
                 ret = this.RawExecuteAffrows();
                 ClearData();
                 return ret;
@@ -161,6 +169,7 @@ namespace FreeSql.Internal.CommonProvider
                     for (var a = 0; a < ss.Length; a++)
                     {
                         _source = ss[a];
+                        _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                         ret += this.RawExecuteAffrows();
                     }
                 }
@@ -176,6 +185,7 @@ namespace FreeSql.Internal.CommonProvider
                             for (var a = 0; a < ss.Length; a++)
                             {
                                 _source = ss[a];
+                                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                                 ret += this.RawExecuteAffrows();
                             }
                             _transaction.Commit();
@@ -211,6 +221,7 @@ namespace FreeSql.Internal.CommonProvider
             var ret = new List<T1>();
             if (ss.Length <= 1)
             {
+                if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
                 ret = this.RawExecuteUpdated();
                 ClearData();
                 return ret;
@@ -228,6 +239,7 @@ namespace FreeSql.Internal.CommonProvider
                     for (var a = 0; a < ss.Length; a++)
                     {
                         _source = ss[a];
+                        _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                         ret.AddRange(this.RawExecuteUpdated());
                     }
                 }
@@ -243,6 +255,7 @@ namespace FreeSql.Internal.CommonProvider
                             for (var a = 0; a < ss.Length; a++)
                             {
                                 _source = ss[a];
+                                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
                                 ret.AddRange(this.RawExecuteUpdated());
                             }
                             _transaction.Commit();

FreeSql/Internal/Model/BatchProgressEventArgs.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace FreeSql.Internal.Model
+{
+    public class BatchProgressStatus<T1>
+    {
+        /// <summary>
+        /// 当前操作的数据
+        /// </summary>
+        public IEnumerable<T1> Data { get; }
+
+        /// <summary>
+        /// 当前批次
+        /// </summary>
+        public int Current { get; }
+
+        /// <summary>
+        /// 总批次数量
+        /// </summary>
+        public int Total { get; }
+
+        public BatchProgressStatus(List<T1> data, int current, int total)
+        {
+            this.Data = data;
+            this.Current = current;
+            this.Total = total;
+        }
+    }
+}

Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs

@@ -6,6 +6,8 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Data.Common;
+using FreeSql.Internal.ObjectPool;
 #if MySqlConnector
 using MySqlConnector;
 #else
@@ -85,28 +87,15 @@ namespace FreeSql.MySql
 
         protected override string GetComparisonDDLStatements(params TypeAndName[] objects)
         {
-            var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+            Object<DbConnection> conn = null;
-            var database = conn.Value.Database;
+            string database = null;
-            Func<string, string, object> ExecuteScalar = (db, sql) =>
+            
-            {
-                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
-                try
-                {
-                    using (var cmd = conn.Value.CreateCommand())
-                    {
-                        cmd.CommandText = sql;
-                        cmd.CommandType = CommandType.Text;
-                        return cmd.ExecuteScalar();
-                    }
-                }
-                finally
-                {
-                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
-                }
-            };
-            var sb = new StringBuilder();
             try
             {
+                conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+                database = conn.Value.Database;
+
+                var sb = new StringBuilder();
                 foreach (var obj in objects)
                 {
                     if (sb.Length > 0) sb.Append("\r\n");
@@ -129,17 +118,17 @@ namespace FreeSql.MySql
                         }
                     }
 
-                    if (string.Compare(tbname[0], database, true) != 0 && ExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tbname[0])) == null) //创建数据库
+                    if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tbname[0])) == null) //创建数据库
                         sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(" default charset utf8 COLLATE utf8_general_ci;\r\n");
 
                     var sbalter = new StringBuilder();
                     var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
-                    if (ExecuteScalar(tbname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tbname)) == null)
+                    if (LocalExecuteScalar(tbname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tbname)) == null)
                     { //表不存在
                         if (tboldname != null)
                         {
-                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && ExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tboldname[0])) == null ||
+                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tboldname[0])) == null ||
-                                ExecuteScalar(tboldname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tboldname)) == null)
+                                LocalExecuteScalar(tboldname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tboldname)) == null)
                                 //数据库或表不存在
                                 tboldname = null;
                         }
@@ -222,7 +211,7 @@ where a.table_schema in ({0}) and a.table_name in ({1})", tboldname ?? tbname);
 
                     if (istmpatler == false)
                     {
-                        var existsPrimary = ExecuteScalar(tbname[0], _commonUtils.FormatSql(" select 1 from information_schema.key_column_usage where table_schema={0} and table_name={1} and constraint_name = 'PRIMARY' limit 1", tbname));
+                        var existsPrimary = LocalExecuteScalar(tbname[0], _commonUtils.FormatSql(" select 1 from information_schema.key_column_usage where table_schema={0} and table_name={1} and constraint_name = 'PRIMARY' limit 1", tbname));
                         foreach (var tbcol in tb.ColumnsByPosition)
                         {
                             var isIdentityChanged = tbcol.Attribute.IsIdentity == true && tbcol.Attribute.DbType.IndexOf("AUTO_INCREMENT", StringComparison.CurrentCultureIgnoreCase) == -1;
@@ -385,7 +374,8 @@ where a.table_schema IN ({0}) and a.table_name IN ({1}) and a.index_name <> 'PRI
             {
                 try
                 {
-                    conn.Value.ChangeDatabase(database);
+                    if (string.IsNullOrEmpty(database) == false)
+                        conn.Value.ChangeDatabase(database);
                     _orm.Ado.MasterPool.Return(conn);
                 }
                 catch
@@ -393,6 +383,24 @@ where a.table_schema IN ({0}) and a.table_name IN ({1}) and a.index_name <> 'PRI
                     _orm.Ado.MasterPool.Return(conn, true);
                 }
             }
+
+            object LocalExecuteScalar(string db, string sql)
+            {
+                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
+                try
+                {
+                    using (var cmd = conn.Value.CreateCommand())
+                    {
+                        cmd.CommandText = sql;
+                        cmd.CommandType = CommandType.Text;
+                        return cmd.ExecuteScalar();
+                    }
+                }
+                finally
+                {
+                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
+                }
+            }
         }
     }
 }

Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlCodeFirst.cs

@@ -1,8 +1,10 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Internal.ObjectPool;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Data.Odbc;
 using System.Linq;
 using System.Text;
@@ -74,28 +76,15 @@ namespace FreeSql.Odbc.MySql
 
         protected override string GetComparisonDDLStatements(params TypeAndName[] objects)
         {
-            var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+            Object<DbConnection> conn = null;
-            var database = conn.Value.Database;
+            string database = null;
-            Func<string, string, object> ExecuteScalar = (db, sql) =>
+            
-            {
-                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
-                try
-                {
-                    using (var cmd = conn.Value.CreateCommand())
-                    {
-                        cmd.CommandText = sql;
-                        cmd.CommandType = CommandType.Text;
-                        return cmd.ExecuteScalar();
-                    }
-                }
-                finally
-                {
-                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
-                }
-            };
-            var sb = new StringBuilder();
             try
             {
+                conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+                database = conn.Value.Database;
+
+                var sb = new StringBuilder();
                 foreach (var obj in objects)
                 {
                     if (sb.Length > 0) sb.Append("\r\n");
@@ -118,17 +107,17 @@ namespace FreeSql.Odbc.MySql
                         }
                     }
 
-                    if (string.Compare(tbname[0], database, true) != 0 && ExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tbname[0])) == null) //创建数据库
+                    if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tbname[0])) == null) //创建数据库
                         sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(" default charset utf8 COLLATE utf8_general_ci;\r\n");
 
                     var sbalter = new StringBuilder();
                     var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
-                    if (ExecuteScalar(tbname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tbname)) == null)
+                    if (LocalExecuteScalar(tbname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tbname)) == null)
                     { //表不存在
                         if (tboldname != null)
                         {
-                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && ExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tboldname[0])) == null ||
+                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tboldname[0])) == null ||
-                                ExecuteScalar(tboldname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tboldname)) == null)
+                                LocalExecuteScalar(tboldname[0], _commonUtils.FormatSql(" SELECT 1 FROM information_schema.TABLES WHERE table_schema={0} and table_name={1}", tboldname)) == null)
                                 //数据库或表不存在
                                 tboldname = null;
                         }
@@ -211,7 +200,7 @@ where a.table_schema in ({0}) and a.table_name in ({1})", tboldname ?? tbname);
 
                     if (istmpatler == false)
                     {
-                        var existsPrimary = ExecuteScalar(tbname[0], _commonUtils.FormatSql(" select 1 from information_schema.key_column_usage where table_schema={0} and table_name={1} and constraint_name = 'PRIMARY' limit 1", tbname));
+                        var existsPrimary = LocalExecuteScalar(tbname[0], _commonUtils.FormatSql(" select 1 from information_schema.key_column_usage where table_schema={0} and table_name={1} and constraint_name = 'PRIMARY' limit 1", tbname));
                         foreach (var tbcol in tb.ColumnsByPosition)
                         {
                             var isIdentityChanged = tbcol.Attribute.IsIdentity == true && tbcol.Attribute.DbType.IndexOf("AUTO_INCREMENT", StringComparison.CurrentCultureIgnoreCase) == -1;
@@ -374,7 +363,8 @@ where a.table_schema IN ({0}) and a.table_name IN ({1}) and a.index_name <> 'PRI
             {
                 try
                 {
-                    conn.Value.ChangeDatabase(database);
+                    if (string.IsNullOrEmpty(database) == false)
+                        conn.Value.ChangeDatabase(database);
                     _orm.Ado.MasterPool.Return(conn);
                 }
                 catch
@@ -382,6 +372,24 @@ where a.table_schema IN ({0}) and a.table_name IN ({1}) and a.index_name <> 'PRI
                     _orm.Ado.MasterPool.Return(conn, true);
                 }
             }
+
+            object LocalExecuteScalar(string db, string sql)
+            {
+                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
+                try
+                {
+                    using (var cmd = conn.Value.CreateCommand())
+                    {
+                        cmd.CommandText = sql;
+                        cmd.CommandType = CommandType.Text;
+                        return cmd.ExecuteScalar();
+                    }
+                }
+                finally
+                {
+                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
+                }
+            }
         }
 
         public override int ExecuteDDLStatements(string ddl)

Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerCodeFirst.cs

@@ -1,8 +1,10 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Internal.ObjectPool;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Data.Odbc;
 using System.Linq;
 using System.Text;
@@ -134,30 +136,15 @@ ELSE
         }
         protected override string GetComparisonDDLStatements(params TypeAndName[] objects)
         {
-            var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+            Object<DbConnection> conn = null;
             string database = null;
+
             try
             {
+                conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
                 database = conn.Value.Database;
-                Func<string, string, object> ExecuteScalar = (db, sql) =>
-                {
-                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
-                    try
-                    {
-                        using (var cmd = conn.Value.CreateCommand())
-                        {
-                            cmd.CommandText = sql;
-                            cmd.CommandType = CommandType.Text;
-                            return cmd.ExecuteScalar();
-                        }
-                    }
-                    finally
-                    {
-                        if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
-                    }
-                };
-                var sb = new StringBuilder();
 
+                var sb = new StringBuilder();
                 foreach (var obj in objects)
                 {
                     if (sb.Length > 0) sb.Append("\r\n");
@@ -184,20 +171,20 @@ ELSE
                     }
                     //codefirst 不支持表名、模式名、数据库名中带 .
 
-                    if (string.Compare(tbname[0], database, true) != 0 && ExecuteScalar(database, $" select 1 from sys.databases where name='{tbname[0]}'") == null) //创建数据库
+                    if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database, $" select 1 from sys.databases where name='{tbname[0]}'") == null) //创建数据库
-                        ExecuteScalar(database, $"if not exists(select 1 from sys.databases where name='{tbname[0]}')\r\n\tcreate database [{tbname[0]}];");
+                        LocalExecuteScalar(database, $"if not exists(select 1 from sys.databases where name='{tbname[0]}')\r\n\tcreate database [{tbname[0]}];");
-                    if (string.Compare(tbname[1], "dbo", true) != 0 && ExecuteScalar(tbname[0], $" select 1 from sys.schemas where name='{tbname[1]}'") == null) //创建模式
+                    if (string.Compare(tbname[1], "dbo", true) != 0 && LocalExecuteScalar(tbname[0], $" select 1 from sys.schemas where name='{tbname[1]}'") == null) //创建模式
-                        ExecuteScalar(tbname[0], $"create schema [{tbname[1]}] authorization [dbo]");
+                        LocalExecuteScalar(tbname[0], $"create schema [{tbname[1]}] authorization [dbo]");
 
                     var sbalter = new StringBuilder();
                     var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
-                    if (ExecuteScalar(tbname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tbname[1]}].[{tbname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
+                    if (LocalExecuteScalar(tbname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tbname[1]}].[{tbname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
                     { //表不存在
                         if (tboldname != null)
                         {
-                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && ExecuteScalar(database, $" select 1 from sys.databases where name='{tboldname[0]}'") == null ||
+                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database, $" select 1 from sys.databases where name='{tboldname[0]}'") == null ||
-                                string.Compare(tboldname[1], tbname[1], true) != 0 && ExecuteScalar(tboldname[0], $" select 1 from sys.schemas where name='{tboldname[1]}'") == null ||
+                                string.Compare(tboldname[1], tbname[1], true) != 0 && LocalExecuteScalar(tboldname[0], $" select 1 from sys.schemas where name='{tboldname[1]}'") == null ||
-                                ExecuteScalar(tboldname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tboldname[1]}].[{tboldname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
+                                LocalExecuteScalar(tboldname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tboldname[1]}].[{tboldname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
                                 //数据库或模式或表不存在
                                 tboldname = null;
                         }
@@ -477,6 +464,24 @@ use [" + database + "];", tboldname ?? tbname);
                     _orm.Ado.MasterPool.Return(conn, true);
                 }
             }
+
+            object LocalExecuteScalar(string db, string sql)
+            {
+                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
+                try
+                {
+                    using (var cmd = conn.Value.CreateCommand())
+                    {
+                        cmd.CommandText = sql;
+                        cmd.CommandType = CommandType.Text;
+                        return cmd.ExecuteScalar();
+                    }
+                }
+                finally
+                {
+                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
+                }
+            }
         }
         string GetTransferDbDefaultValue(ColumnInfo col)
         {

Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs

@@ -1,8 +1,10 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Internal.ObjectPool;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Linq;
 using System.Text;
 
@@ -133,30 +135,15 @@ ELSE
         }
         protected override string GetComparisonDDLStatements(params TypeAndName[] objects)
         {
-            var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+            Object<DbConnection> conn = null;
             string database = null;
+
             try
             {
+                conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
                 database = conn.Value.Database;
-                Func<string, string, object> ExecuteScalar = (db, sql) =>
-                {
-                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
-                    try
-                    {
-                        using (var cmd = conn.Value.CreateCommand())
-                        {
-                            cmd.CommandText = sql;
-                            cmd.CommandType = CommandType.Text;
-                            return cmd.ExecuteScalar();
-                        }
-                    }
-                    finally
-                    {
-                        if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
-                    }
-                };
-                var sb = new StringBuilder();
 
+                var sb = new StringBuilder();
                 foreach (var obj in objects)
                 {
                     if (sb.Length > 0) sb.Append("\r\n");
@@ -183,20 +170,20 @@ ELSE
                     }
                     //codefirst 不支持表名、模式名、数据库名中带 .
 
-                    if (string.Compare(tbname[0], database, true) != 0 && ExecuteScalar(database, $" select 1 from sys.databases where name='{tbname[0]}'") == null) //创建数据库
+                    if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database, $" select 1 from sys.databases where name='{tbname[0]}'") == null) //创建数据库
-                        ExecuteScalar(database, $"if not exists(select 1 from sys.databases where name='{tbname[0]}')\r\n\tcreate database [{tbname[0]}];");
+                        LocalExecuteScalar(database, $"if not exists(select 1 from sys.databases where name='{tbname[0]}')\r\n\tcreate database [{tbname[0]}];");
-                    if (string.Compare(tbname[1], "dbo", true) != 0 && ExecuteScalar(tbname[0], $" select 1 from sys.schemas where name='{tbname[1]}'") == null) //创建模式
+                    if (string.Compare(tbname[1], "dbo", true) != 0 && LocalExecuteScalar(tbname[0], $" select 1 from sys.schemas where name='{tbname[1]}'") == null) //创建模式
-                        ExecuteScalar(tbname[0], $"create schema [{tbname[1]}] authorization [dbo]");
+                        LocalExecuteScalar(tbname[0], $"create schema [{tbname[1]}] authorization [dbo]");
 
                     var sbalter = new StringBuilder();
                     var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
-                    if (ExecuteScalar(tbname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tbname[1]}].[{tbname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
+                    if (LocalExecuteScalar(tbname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tbname[1]}].[{tbname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
                     { //表不存在
                         if (tboldname != null)
                         {
-                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && ExecuteScalar(database, $" select 1 from sys.databases where name='{tboldname[0]}'") == null ||
+                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database, $" select 1 from sys.databases where name='{tboldname[0]}'") == null ||
-                                string.Compare(tboldname[1], tbname[1], true) != 0 && ExecuteScalar(tboldname[0], $" select 1 from sys.schemas where name='{tboldname[1]}'") == null ||
+                                string.Compare(tboldname[1], tbname[1], true) != 0 && LocalExecuteScalar(tboldname[0], $" select 1 from sys.schemas where name='{tboldname[1]}'") == null ||
-                                ExecuteScalar(tboldname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tboldname[1]}].[{tboldname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
+                                LocalExecuteScalar(tboldname[0], $" select 1 from dbo.sysobjects where id = object_id(N'[{tboldname[1]}].[{tboldname[2]}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1") == null)
                                 //数据库或模式或表不存在
                                 tboldname = null;
                         }
@@ -476,6 +463,24 @@ use [" + database + "];", tboldname ?? tbname);
                     _orm.Ado.MasterPool.Return(conn, true);
                 }
             }
+
+            object LocalExecuteScalar(string db, string sql)
+            {
+                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
+                try
+                {
+                    using (var cmd = conn.Value.CreateCommand())
+                    {
+                        cmd.CommandText = sql;
+                        cmd.CommandType = CommandType.Text;
+                        return cmd.ExecuteScalar();
+                    }
+                }
+                finally
+                {
+                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
+                }
+            }
         }
         string GetTransferDbDefaultValue(ColumnInfo col)
         {