- 增加 IAdo.CommandFluent(sql) 方法执行 SQL 命令；

- 修复 SqlServer SqlBulkCopy IgnoreColumns 无效的 bug；
dotnetcore · Sep 23, 2020 · 8a0862d · 8a0862d
1 parent 9b93200
commit 8a0862d
Show file tree

Hide file tree

Showing 25 changed files with 225 additions and 44 deletions.
diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
@@ -12,7 +12,7 @@
     <Description>使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator</Description>
     <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
     <RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
-    <Version>1.8.1.330</Version>
+    <Version>1.9.0-preview0920</Version>
     <PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
   </PropertyGroup>
 

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs
@@ -171,6 +171,7 @@ public void ExecuteSqlBulkCopy()
             for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100, CreateTime = DateTime.Now });
 
             insert.AppendData(items).InsertIdentity().ExecuteSqlBulkCopy();
+            insert.AppendData(items).IgnoreColumns(a => new { a.CreateTime, a.Clicks }).ExecuteSqlBulkCopy();
             // System.NotSupportedException:“DataSet does not support System.Nullable<>.”
         }
 

diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Interface/IAdo.cs b/FreeSql/Interface/IAdo.cs
@@ -62,6 +62,21 @@ public partial interface IAdo
         /// <returns></returns>
         DbParameter[] GetDbParamtersByObject(object obj);
 
+        /// <summary>
+        /// SQL 命令执行类，fsql.Ado.CommandFluent("select * from user where age > ?age", new { age = 25 })<para></para>
+        /// .WithConnection(connection)<para></para>
+        /// .WithTransaction(transaction)<para></para>
+        /// .WithParameter("age", 25)<para></para>
+        /// .WithParameter("id", 11)<para></para>
+        /// .CommandType(CommandType.Text)<para></para>
+        /// .CommandTimeout(60)<para></para>
+        /// .Query&lt;T&gt;(); 或者 ExecuteNonQuery/ExecuteScalar/ExecuteDataTable/ExecuteDataSet/ExecuteArray
+        /// </summary>
+        /// <param name="cmdText"></param>
+        /// <param name="parms"></param>
+        /// <returns></returns>
+        AdoCommandFluent CommandFluent(string cmdText, object parms = null);
+
         /// <summary>
         /// 测试数据库是否连接正确，本方法执行如下命令：<para></para>
         /// MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>

diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
@@ -16,8 +16,8 @@ public abstract partial class AdoProvider : IAdo, IDisposable
     {
 
         protected abstract void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex);
-        protected abstract DbCommand CreateCommand();
-        protected abstract DbParameter[] GetDbParamtersByObject(string sql, object obj);
+        public abstract DbCommand CreateCommand();
+        public abstract DbParameter[] GetDbParamtersByObject(string sql, object obj);
         public DbParameter[] GetDbParamtersByObject(object obj) => GetDbParamtersByObject("*", obj);
 
         protected bool IsTracePerformance => _util?._orm?.Aop.CommandAfterHandler != null;
@@ -28,6 +28,7 @@ public abstract partial class AdoProvider : IAdo, IDisposable
         public string ConnectionString { get; }
         public string[] SlaveConnectionStrings { get; }
         public Guid Identifier { get; }
+
         protected CommonUtils _util { get; set; }
         protected int slaveUnavailables = 0;
         private object slaveLock = new object();
@@ -97,6 +98,8 @@ internal Dictionary<string, PropertyInfo> GetQueryTypeProperties(Type type)
             //return props;
         }
 
+        public AdoCommandFluent CommandFluent(string cmdText, object parms = null) => new AdoCommandFluent(this, cmdText, parms);
+
         public bool ExecuteConnectTest(int commandTimeout = 0)
         {
             try

diff --git a/FreeSql/Internal/Model/AdoCommandFluent.cs b/FreeSql/Internal/Model/AdoCommandFluent.cs
@@ -0,0 +1,113 @@
+using FreeSql.Internal.CommonProvider;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FreeSql.Internal.Model
+{
+    public class AdoCommandFluent
+    {
+        internal protected AdoProvider Ado { get; protected set; }
+        internal protected DbConnection Connection { get; protected set; }
+        internal protected DbTransaction Transaction { get; protected set; }
+        internal protected CommandType CmdType { get; protected set; } = System.Data.CommandType.Text;
+        internal protected string CmdText { get; protected set; }
+        internal protected int CmdTimeout { get; protected set; }
+        internal protected List<DbParameter> CmdParameters { get; } = new List<DbParameter>();
+
+        public AdoCommandFluent(AdoProvider ado, string commandText, object parms)
+        {
+            this.Ado = ado;
+            this.CmdText = commandText;
+            this.CmdParameters.AddRange(this.Ado.GetDbParamtersByObject(parms));
+        }
+
+        /// <summary>
+        /// 使用指定 DbConnection 连接执行
+        /// </summary>
+        /// <param name="conn"></param>
+        /// <returns></returns>
+        public AdoCommandFluent WithConnection(DbConnection conn)
+        {
+            this.Transaction = null;
+            this.Connection = conn;
+            return this;
+        }
+        /// <summary>
+        /// 使用指定 DbTransaction 事务执行
+        /// </summary>
+        /// <param name="tran"></param>
+        /// <returns></returns>
+        public AdoCommandFluent WithTransaction(DbTransaction tran)
+        {
+            this.Transaction = tran;
+            if (tran != null) this.Connection = tran.Connection;
+            return this;
+        }
+
+        /// <summary>
+        /// 增加参数化对象
+        /// </summary>
+        /// <param name="parameterName">参数名</param>
+        /// <param name="value">参数值</param>
+        /// <param name="modify">修改本次创建好的参数化对象，比如将 parameterName 参数修改为 Output 类型</param>
+        /// <returns></returns>
+        public AdoCommandFluent WithParameter(string parameterName, object value, Action<DbParameter> modify = null)
+        {
+            var param = this.Ado.GetDbParamtersByObject(new Dictionary<string, object> { [parameterName] = value }).FirstOrDefault();
+            modify?.Invoke(param);
+            this.CmdParameters.Add(param);
+            return this;
+        }
+
+        /// <summary>
+        /// 设置执行的命令类型，SQL文本、或存储过程
+        /// </summary>
+        /// <param name="commandType"></param>
+        /// <returns></returns>
+        public AdoCommandFluent CommandType(CommandType commandType)
+        {
+            this.CmdType = commandType;
+            return this;
+        }
+        /// <summary>
+        /// 设置命令执行超时（秒）
+        /// </summary>
+        /// <param name="commandTimeout"></param>
+        /// <returns></returns>
+        public AdoCommandFluent CommandTimeout(int commandTimeout)
+        {
+            this.CmdTimeout = commandTimeout;
+            return this;
+        }
+
+        public int ExecuteNonQuery() => this.Ado.ExecuteNonQuery(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public object ExecuteScalar() => this.Ado.ExecuteScalar(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public DataTable ExecuteDataTable() => this.Ado.ExecuteDataTable(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public DataSet ExecuteDataSet() => this.Ado.ExecuteDataSet(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public object[][] ExecuteArray() => this.Ado.ExecuteArray(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public List<T> Query<T>() => this.Ado.Query<T>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public NativeTuple<List<T1>, List<T2>> Query<T1, T2>() => this.Ado.Query<T1, T2>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public NativeTuple<List<T1>, List<T2>, List<T3>> Query<T1, T2, T3>() => this.Ado.Query<T1, T2, T3>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public NativeTuple<List<T1>, List<T2>, List<T3>, List<T4>> Query<T1, T2, T3, T4>() => this.Ado.Query<T1, T2, T3, T4>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public NativeTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>> Query<T1, T2, T3, T4, T5>() => this.Ado.Query<T1, T2, T3, T4, T5>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+
+#if net40
+#else
+        public Task<int> ExecuteNonQueryAsync() => this.Ado.ExecuteNonQueryAsync(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<object> ExecuteScalarAsync() => this.Ado.ExecuteScalarAsync(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<DataTable> ExecuteDataTableAsync() => this.Ado.ExecuteDataTableAsync(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<DataSet> ExecuteDataSetAsync() => this.Ado.ExecuteDataSetAsync(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<object[][]> ExecuteArrayAsync() => this.Ado.ExecuteArrayAsync(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<List<T>> QueryAsync<T>() => this.Ado.QueryAsync<T>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<NativeTuple<List<T1>, List<T2>>> QueryAsync<T1, T2>() => this.Ado.QueryAsync<T1, T2>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<NativeTuple<List<T1>, List<T2>, List<T3>>> QueryAsync<T1, T2, T3>() => this.Ado.QueryAsync<T1, T2, T3>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<NativeTuple<List<T1>, List<T2>, List<T3>, List<T4>>> QueryAsync<T1, T2, T3, T4>() => this.Ado.QueryAsync<T1, T2, T3, T4>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+        public Task<NativeTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>>> QueryAsync<T1, T2, T3, T4, T5>() => this.Ado.QueryAsync<T1, T2, T3, T4, T5>(this.Connection, this.Transaction, this.CmdType, this.CmdText, this.CmdTimeout, this.CmdParameters.ToArray());
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs
@@ -60,7 +60,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             //if (param is string) return string.Concat('N', nparms[a]);
         }
 
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             return new DmCommand();
         }
@@ -72,6 +72,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }
diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdAdo.cs b/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdAdo.cs
@@ -62,7 +62,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
         }
 
         DbConnection _CreateCommandConnection;
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             if (_CreateCommandConnection != null)
             {
@@ -80,6 +80,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }
diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESAdo.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESAdo.cs
@@ -61,7 +61,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             return string.Concat("'", param.ToString().Replace("'", "''"), "'");
         }
 
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             return new KdbndpCommand();
         }
@@ -73,6 +73,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }
diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessAdo.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessAdo.cs
@@ -65,7 +65,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             return string.Concat("'", param.ToString().Replace("'", "''"), "'");
         }
 
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             return new OleDbCommand();
         }
@@ -77,6 +77,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }
diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
@@ -67,7 +67,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\"), "'");
         }
 
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             return new MySqlCommand();
         }
@@ -79,6 +79,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengAdo.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengAdo.cs
@@ -61,7 +61,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             //if (param is string) return string.Concat('N', nparms[a]);
         }
 
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             return new OdbcCommand();
         }
@@ -73,6 +73,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }
diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcAdo.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcAdo.cs
@@ -62,7 +62,7 @@ public override object AddslashesProcessParam(object param, Type mapType, Column
             return string.Concat("'", param.ToString().Replace("'", "''"), "'");
         }
 
-        protected override DbCommand CreateCommand()
+        public override DbCommand CreateCommand()
         {
             return new OdbcCommand();
         }
@@ -74,6 +74,6 @@ protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<
             else pool.Return(conn);
         }
 
-        protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
     }
 }