diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index d198eb6c..ce9ce69d 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -130,6 +130,13 @@ 清空状态数据 + + + 根据 lambda 条件删除数据 + + + + 添加 @@ -525,5 +532,14 @@ + + + 批量注入 Repository，可以参考代码自行调整 + + + + + + diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs index 73b8e612..48c9376e 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs @@ -105,6 +105,11 @@ namespace FreeSql.Tests.MySqlConnector Assert.Equal(1, g.mysql.Insert().AppendData(new TestEnumInsertTb { type = TestEnumInserTbType.sum211 }).ExecuteAffrows()); Assert.Equal(1, g.mysql.Insert().AppendData(new TestEnumInsertTb { type = TestEnumInserTbType.sum211 }).NoneParameter().ExecuteAffrows()); + + Assert.Equal(10, g.mysql.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs index 988f0685..fbbf4931 100644 --- a/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs @@ -177,6 +177,11 @@ INTO ""TB_TOPIC_INSERT""(""CLICKS"") VALUES(900) Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.dameng.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs index 0f14a9b8..1d7d3161 100644 --- a/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs @@ -215,6 +215,11 @@ UNION ALL Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.NoneParameter().AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.firebird.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/KingbaseES/Curd/KingbaseESInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/KingbaseES/Curd/KingbaseESInsertTest.cs index bf4411ca..eb400cf0 100644 --- a/FreeSql.Tests/FreeSql.Tests/KingbaseES/Curd/KingbaseESInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/KingbaseES/Curd/KingbaseESInsertTest.cs @@ -89,6 +89,11 @@ namespace FreeSql.Tests.KingbaseES Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.kingbaseES.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs index c2e44197..3e8fcf0e 100644 --- a/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs @@ -92,6 +92,11 @@ namespace FreeSql.Tests.MsAccess //items = Enumerable.Range(0, 9989).Select(a => new Topic { Title = "newtitle" + a, CreateTime = DateTime.Now }).ToList(); //Assert.Equal(9989, g.msaccess.Insert(items).ExecuteAffrows()); + + Assert.Equal(10, g.msaccess.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs index 3f4ee371..ff75484b 100644 --- a/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs @@ -106,6 +106,11 @@ namespace FreeSql.Tests.MySql Assert.Equal(1, g.mysql.Insert().AppendData(new TestEnumInsertTb { type = TestEnumInserTbType.sum211 }).ExecuteAffrows()); Assert.Equal(1, g.mysql.Insert().AppendData(new TestEnumInsertTb { type = TestEnumInserTbType.sum211 }).NoneParameter().ExecuteAffrows()); + + Assert.Equal(10, g.mysql.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs index 6f0bff0f..64315042 100644 --- a/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs @@ -177,6 +177,11 @@ INTO ""TB_TOPIC_INSERT""(""CLICKS"") VALUES(:Clicks_9) Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.oracle.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs index 3617db5c..0803513d 100644 --- a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs @@ -89,6 +89,11 @@ namespace FreeSql.Tests.PostgreSQL Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.pgsql.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs index d036d099..e771cee9 100644 --- a/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs @@ -89,6 +89,11 @@ namespace FreeSql.Tests.ShenTong Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.shentong.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs index 20f73c87..7122c4fe 100644 --- a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs @@ -100,6 +100,11 @@ namespace FreeSql.Tests.SqlServer Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).NoneParameter().ExecuteAffrows()); + Assert.Equal(10, g.sqlserver.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); + //items = Enumerable.Range(0, 9989).Select(a => new Topic { Title = "newtitle" + a, CreateTime = DateTime.Now }).ToList(); //Assert.Equal(9989, g.sqlserver.Insert(items).ExecuteAffrows()); diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs index ac532f9d..d3579aa0 100644 --- a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs @@ -89,6 +89,11 @@ namespace FreeSql.Tests.Sqlite Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows()); Assert.Equal(10, insert.AppendData(items).ExecuteAffrows()); + + Assert.Equal(10, g.sqlite.Select().Limit(10).InsertInto(null, a => new Topic + { + Title = a.Title + })); } [Fact] public void ExecuteIdentity() diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 8fd7f738..e984b6cb 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -2046,6 +2046,15 @@ lambda表达式 + + + 将查询转换为 INSERT INTO tableName SELECT ... FROM t 执行插入 + + + 指定插入的表名，若为 null 则使用 TTargetEntity 实体表名 + 选择列 + 返回影响的行数 + 执行SQL查询，返回 DataTable @@ -2997,154 +3006,6 @@ - - - 测试数据库是否连接正确，本方法执行如下命令： - MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1 - Oracle: SELECT 1 FROM dual - - 命令超时设置(秒) - true: 成功, false: 失败 - - - - 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】 - - - - - - - - - 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - 查询 - - - - - - - 查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 查询 - - - - - - - 查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 查询 - - - - - - - 查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 在【主库】执行 - - - - - - - - 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 在【主库】执行 - - - - - - - - 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > ?age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 执行SQL返回对象集合，Query<User>("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - 执行SQL返回对象集合，Query<User, Address>("select * from user where age > ?age; select * from address", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - 可自定义解析表达式 @@ -3951,12 +3812,6 @@ 超时 - - - 获取资源 - - - 使用完毕后，归还资源 @@ -4027,12 +3882,6 @@ 资源对象 - - - 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象 - - 资源对象 - 归还对象给对象池的时候触发 @@ -4643,3 +4492,190 @@ +essions.Expression{System.Func{``0,``1,``2,``3,``4,System.Boolean}},System.Linq.Expressions.Expression{System.Func{``0,``1,``2,``3,``4,System.Boolean}})"> + + 使用 and 拼接两个 lambda 表达式 + + + + + + 使用 and 拼接两个 lambda 表达式 + + + true 时生效 + + + + + + 使用 or 拼接两个 lambda 表达式 + + + + + + 使用 or 拼接两个 lambda 表达式 + + + true 时生效 + + + + + + 将 lambda 表达式取反 + + + true 时生效 + + + + + 生成类似Mongodb的ObjectId有序、不重复Guid + + + + + + 插入数据 + + + + + + + 插入数据，传入实体 + + + + + + + + 插入数据，传入实体数组 + + + + + + + + 插入数据，传入实体集合 + + + + + + + + 插入数据，传入实体集合 + + + + + + + + 插入或更新数据，此功能依赖数据库特性（低版本可能不支持），参考如下： + MySql 5.6+: on duplicate key update + PostgreSQL 9.4+: on conflict do update + SqlServer 2008+: merge into + Oracle 11+: merge into + Sqlite: replace into + 达梦: merge into + 人大金仓：on conflict do update + 神通：merge into + MsAccess：不支持 + 注意区别：FreeSql.Repository 仓储也有 InsertOrUpdate 方法（不依赖数据库特性） + + + + + + + 修改数据 + + + + + + + 修改数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1} + + + 主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合 + + + + + 查询数据 + + + + + + + 查询数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1} + + + 主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合 + + + + + 删除数据 + + + + + + + 删除数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1} + + + 主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合 + + + + + 开启事务（不支持异步） + v1.5.0 关闭了线程事务超时自动提交的机制 + + 事务体 () => {} + + + + 开启事务（不支持异步） + v1.5.0 关闭了线程事务超时自动提交的机制 + + + 事务体 () => {} + + + + 数据库访问对象 + + + + + 所有拦截方法都在这里 + + + + + CodeFirst 模式开发相关方法 + + + + + DbFirst 模式开发相关方法 + + + + + 全局过滤设置，可默认附加为 Select/Update/Delete 条件 + + + + diff --git a/FreeSql/Interface/Curd/ISelect/ISelect1.cs b/FreeSql/Interface/Curd/ISelect/ISelect1.cs index b6cef93a..b5e061f5 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect1.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect1.cs @@ -15,6 +15,7 @@ namespace FreeSql #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -38,6 +39,15 @@ namespace FreeSql /// bool Any(Expression> exp); + /// + /// 将查询转换为 INSERT INTO tableName SELECT ... FROM t 执行插入 + /// + /// + /// 指定插入的表名，若为 null 则使用 TTargetEntity 实体表名 + /// 选择列 + /// 返回影响的行数 + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; + /// /// 执行SQL查询，返回 DataTable /// diff --git a/FreeSql/Interface/Curd/ISelect/ISelect10.cs b/FreeSql/Interface/Curd/ISelect/ISelect10.cs index f35462e6..4b0a2862 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect10.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect10.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect11.cs b/FreeSql/Interface/Curd/ISelect/ISelect11.cs index 57e19df4..ef22e1a8 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect11.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect11.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect12.cs b/FreeSql/Interface/Curd/ISelect/ISelect12.cs index 05422fa9..c41853a9 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect12.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect12.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect13.cs b/FreeSql/Interface/Curd/ISelect/ISelect13.cs index fb87f33a..b1a5f708 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect13.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect13.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect14.cs b/FreeSql/Interface/Curd/ISelect/ISelect14.cs index 786fa125..42d8dbec 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect14.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect14.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect15.cs b/FreeSql/Interface/Curd/ISelect/ISelect15.cs index 9bdd3238..a0eaf778 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect15.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect15.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect16.cs b/FreeSql/Interface/Curd/ISelect/ISelect16.cs index 7d1651ba..2261ce16 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect16.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect16.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect2.cs b/FreeSql/Interface/Curd/ISelect/ISelect2.cs index a6aeaa28..0302108f 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect2.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect2.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect3.cs b/FreeSql/Interface/Curd/ISelect/ISelect3.cs index 35a6212a..7343cabe 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect3.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect3.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect4.cs b/FreeSql/Interface/Curd/ISelect/ISelect4.cs index 93c6f809..622351c8 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect4.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect4.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect5.cs b/FreeSql/Interface/Curd/ISelect/ISelect5.cs index 12f4714b..ec19c52a 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect5.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect5.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect6.cs b/FreeSql/Interface/Curd/ISelect/ISelect6.cs index a6f6dffb..b18bdac0 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect6.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect6.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect7.cs b/FreeSql/Interface/Curd/ISelect/ISelect7.cs index 50c4f0a6..f16a7063 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect7.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect7.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect8.cs b/FreeSql/Interface/Curd/ISelect/ISelect8.cs index f03b7904..31f7d5c3 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect8.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect8.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect9.cs b/FreeSql/Interface/Curd/ISelect/ISelect9.cs index 99218e60..7a528689 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect9.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect9.cs @@ -13,6 +13,7 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); + Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class; Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); @@ -29,6 +30,7 @@ namespace FreeSql #endif bool Any(Expression> exp); + int InsertInto(string tableName, Expression> select) where TTargetEntity : class; DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs index 408d1193..550d1ad9 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs @@ -683,6 +683,61 @@ namespace FreeSql.Internal.CommonProvider var af = this.GetExpressionField(select, fieldAlias); return this.ToSql(af.field); } + protected string InternalGetInsertIntoToSql(string tableName, Expression select) + { + var tb = _orm.CodeFirst.GetTableByEntity(typeof(TTargetEntity)); + if (tb == null) throw new ArgumentException($"ISelect.InsertInto() 类型错误: {typeof(TTargetEntity).DisplayCsharp()}"); + if (string.IsNullOrEmpty(tableName)) tableName = tb.DbName; + if (_orm.CodeFirst.IsSyncStructureToLower) tableName = tableName.ToLower(); + if (_orm.CodeFirst.IsSyncStructureToUpper) tableName = tableName.ToUpper(); + + var map = new ReadAnonymousTypeInfo(); + var field = new StringBuilder(); + var index = -10000; //临时规则，不返回 as1 + + _commonExpression.ReadAnonymousField(_tables, field, map, ref index, select, null, null, _whereCascadeExpression, null, false); //不走 DTO 映射，不处理 IncludeMany + + var childs = map.Childs; + if (childs.Any() == false) throw new ArgumentException($"ISelect.InsertInto() 未选择属性: {typeof(TTargetEntity).DisplayCsharp()}"); + foreach(var col in tb.Columns.Values) + { + if (col.Attribute.IsIdentity && string.IsNullOrEmpty(col.DbInsertValue)) continue; + if (col.Attribute.CanInsert == false) continue; + if (childs.Any(a => a.CsName == col.CsName)) continue; + var dbfield = string.IsNullOrWhiteSpace(col.DbInsertValue) == false ? col.DbInsertValue : col.DbDefaultValue; + childs.Add(new ReadAnonymousTypeInfo { DbField = dbfield, CsName = col.CsName }); + } + var selectField = string.Join(", ", childs.Select(a => a.DbField)); + var selectSql = this.ToSql(selectField); + var insertField = string.Join(", ", childs.Select(a => _commonUtils.QuoteSqlName(tb.Columns[a.CsName].Attribute.Name))); + var sql = $"INSERT INTO {_commonUtils.QuoteSqlName(tableName)}({insertField})\r\n{selectSql}"; + return sql; + } + public int InternalInsertInto(string tableName, Expression select) + { + var sql = this.InternalGetInsertIntoToSql(tableName, select); + var dbParms = _params.ToArray(); + var tb = _orm.CodeFirst.GetTableByEntity(typeof(TTargetEntity)); + var before = new Aop.CurdBeforeEventArgs(tb.Type, tb, Aop.CurdType.Insert, sql, dbParms); + _orm.Aop.CurdBeforeHandler?.Invoke(this, before); + int ret = 0; + Exception exception = null; + try + { + ret = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + } + catch (Exception ex) + { + exception = ex; + throw ex; + } + finally + { + var after = new Aop.CurdAfterEventArgs(before, exception, ret); + _orm.Aop.CurdAfterHandler?.Invoke(this, after); + } + return ret; + } protected DataTable InternalToDataTable(Expression select) { @@ -949,6 +1004,32 @@ namespace FreeSql.Internal.CommonProvider protected Task> InternalToListAsync(Expression select) => this.ToListMapReaderAsync(this.GetExpressionField(select)); + async public Task InternalInsertIntoAsync(string tableName, Expression select) + { + var sql = this.InternalGetInsertIntoToSql(tableName, select); + var dbParms = _params.ToArray(); + var tb = _orm.CodeFirst.GetTableByEntity(typeof(TTargetEntity)); + var before = new Aop.CurdBeforeEventArgs(tb.Type, tb, Aop.CurdType.Insert, sql, dbParms); + _orm.Aop.CurdBeforeHandler?.Invoke(this, before); + int ret = 0; + Exception exception = null; + try + { + ret = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + } + catch (Exception ex) + { + exception = ex; + throw ex; + } + finally + { + var after = new Aop.CurdAfterEventArgs(before, exception, ret); + _orm.Aop.CurdAfterHandler?.Invoke(this, after); + } + return ret; + } + async protected Task InternalToDataTableAsync(Expression select) { var sql = this.InternalToSql(select, FieldAliasOptions.AsProperty); //DataTable 使用 AsProperty diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs index 1e9a712a..f4027dcd 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs @@ -160,6 +160,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -268,6 +275,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select11Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select11Provider.cs index 593a7744..bef394ab 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select11Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select11Provider.cs @@ -164,6 +164,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -272,6 +279,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select12Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select12Provider.cs index f24459c2..bb338340 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select12Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select12Provider.cs @@ -168,6 +168,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -276,6 +283,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select13Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select13Provider.cs index d2006c68..8d859e11 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select13Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select13Provider.cs @@ -172,6 +172,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -280,6 +287,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select14Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select14Provider.cs index e8f7a9fe..92265894 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select14Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select14Provider.cs @@ -176,6 +176,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -284,6 +291,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select15Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select15Provider.cs index bb70221a..a9e85428 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select15Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select15Provider.cs @@ -180,6 +180,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -288,6 +295,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select16Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select16Provider.cs index 9388a4e7..81f078f2 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select16Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select16Provider.cs @@ -184,6 +184,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -292,6 +299,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs index 7e52c879..afda8923 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs @@ -392,6 +392,8 @@ namespace FreeSql.Internal.CommonProvider public override List ToList(bool includeNestedMembers = false) => base.ToList(_isIncluded || includeNestedMembers); + public int InsertInto(string tableName, Expression> select) where TTargetEntity : class => base.InternalInsertInto(tableName, select); + bool _isIncluded = false; public ISelect Include(Expression> navigateSelector) where TNavigate : class { @@ -1253,6 +1255,8 @@ namespace FreeSql.Internal.CommonProvider } public Task> ToListAsync() => ToListAsync(GetToListDtoSelector()); + public Task InsertIntoAsync(string tableName, Expression> select) where TTargetEntity : class => base.InternalInsertIntoAsync(tableName, select); + public Task ToDataTableAsync(Expression> select) { if (select == null) return this.InternalToDataTableAsync(select?.Body); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs index 005e485b..bba3c916 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs @@ -106,6 +106,7 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; return this.InternalToList(select?.Body); } + List ISelect.ToList() => (this as ISelect).ToList(GetToListDtoSelector()); Expression> GetToListDtoSelector() { @@ -114,6 +115,7 @@ namespace FreeSql.Internal.CommonProvider _tables[0].Parameter ?? Expression.Parameter(typeof(T1), "a"), Expression.Parameter(typeof(T2), "b")); } + public void ToChunk(Expression> select, int size, Action>> done) { if (select == null || done == null) return; @@ -128,6 +130,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -236,6 +245,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs index 707eccf8..e5d59a90 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs @@ -132,6 +132,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -240,6 +247,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs index c23c314c..80752cd5 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs @@ -136,6 +136,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -244,6 +251,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs index d85e2577..ca7b7e23 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs @@ -140,6 +140,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -248,6 +255,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs index 71e7edd6..622e2b16 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs @@ -144,6 +144,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -252,6 +259,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs index 5b9657c3..70d4b819 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs @@ -148,6 +148,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -256,6 +263,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs index ae1eb8bd..e7c71db7 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs @@ -152,6 +152,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -260,6 +267,13 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTableAsync(select?.Body); } + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + async Task ISelect.AnyAsync(Expression> exp) { if (exp == null) return await this.AnyAsync(); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs index f14ae04f..9e7c80f5 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs @@ -38,15 +38,15 @@ namespace FreeSql.Internal.CommonProvider { this.AsTable((type, old) => { - if (type == _tables[0].Table?.Type && string.IsNullOrEmpty(sqlT1) == false) return $"( {sqlT1} )"; - if (type == _tables[1].Table?.Type && string.IsNullOrEmpty(sqlT2) == false) return $"( {sqlT2} )"; - if (type == _tables[2].Table?.Type && string.IsNullOrEmpty(sqlT3) == false) return $"( {sqlT3} )"; - if (type == _tables[3].Table?.Type && string.IsNullOrEmpty(sqlT4) == false) return $"( {sqlT4} )"; - if (type == _tables[4].Table?.Type && string.IsNullOrEmpty(sqlT5) == false) return $"( {sqlT5} )"; - if (type == _tables[5].Table?.Type && string.IsNullOrEmpty(sqlT6) == false) return $"( {sqlT6} )"; - if (type == _tables[6].Table?.Type && string.IsNullOrEmpty(sqlT7) == false) return $"( {sqlT7} )"; - if (type == _tables[7].Table?.Type && string.IsNullOrEmpty(sqlT8) == false) return $"( {sqlT8} )"; - if (type == _tables[8].Table?.Type && string.IsNullOrEmpty(sqlT9) == false) return $"( {sqlT9} )"; + if (type == _tables[0].Table?.Type) return $"( {sqlT1} )"; + if (type == _tables[1].Table?.Type) return $"( {sqlT2} )"; + if (type == _tables[2].Table?.Type) return $"( {sqlT3} )"; + if (type == _tables[3].Table?.Type) return $"( {sqlT4} )"; + if (type == _tables[4].Table?.Type) return $"( {sqlT5} )"; + if (type == _tables[5].Table?.Type) return $"( {sqlT6} )"; + if (type == _tables[6].Table?.Type) return $"( {sqlT7} )"; + if (type == _tables[7].Table?.Type) return $"( {sqlT8} )"; + if (type == _tables[8].Table?.Type) return $"( {sqlT9} )"; return old; }); if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject($"{sqlT1};\r\n{sqlT2};\r\n{sqlT3};\r\n{sqlT4};\r\n{sqlT5};\r\n{sqlT6};\r\n{sqlT7};\r\n{sqlT8};\r\n{sqlT9}", parms)); @@ -55,7 +55,7 @@ namespace FreeSql.Internal.CommonProvider double ISelect.Avg(Expression> column) { - if (column == null) return default(double); + if (column == null) return 0; for (var a = 0; a < column.Parameters.Count; a++) _tables[a].Parameter = column.Parameters[a]; return this.InternalAvg(column?.Body); } @@ -155,6 +155,14 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; return this.InternalToDataTable(select?.Body); } + + int ISelect.InsertInto(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertInto(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertInto(tableName, select?.Body); + } + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); @@ -168,12 +176,14 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.InternalJoin(exp?.Body, SelectTableInfoType.LeftJoin); } + ISelect ISelect.InnerJoin(Expression> exp) { if (exp == null) return this.InternalJoin(exp?.Body, SelectTableInfoType.LeftJoin); for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.InternalJoin(exp?.Body, SelectTableInfoType.InnerJoin); } + ISelect ISelect.RightJoin(Expression> exp) { if (exp == null) return this.InternalJoin(exp?.Body, SelectTableInfoType.LeftJoin); @@ -187,11 +197,12 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)); } + ISelect ISelect.WhereIf(bool condition, Expression> exp) { - if (condition == false || exp == null) return this; + if (condition == false || exp == null) return this.Where(null); for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; - return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)); + return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)) : this; } bool ISelect.Any(Expression> exp) @@ -210,25 +221,6 @@ namespace FreeSql.Internal.CommonProvider #if net40 #else - async Task ISelect.AnyAsync(Expression> exp) - { - if (exp == null) return await this.AnyAsync(); - for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; - var oldwhere = _where.ToString(); - var ret = await this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); - _where.Clear().Append(oldwhere); - return ret; - } - - Task ISelect.ToDataTableAsync(Expression> select) - { - if (select == null) return this.InternalToDataTableAsync(select?.Body); - for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; - return this.InternalToDataTableAsync(select?.Body); - } - - Task> ISelect.ToListAsync() => (this as ISelect).ToListAsync(GetToListDtoSelector()); - Task ISelect.AvgAsync(Expression> column) { if (column == null) return Task.FromResult(default(double)); @@ -270,6 +262,31 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; return this.InternalToListAsync(select?.Body); } + Task> ISelect.ToListAsync() => (this as ISelect).ToListAsync(GetToListDtoSelector()); + + Task ISelect.ToDataTableAsync(Expression> select) + { + if (select == null) return this.InternalToDataTableAsync(select?.Body); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalToDataTableAsync(select?.Body); + } + + Task ISelect.InsertIntoAsync(string tableName, Expression> select) + { + if (select == null) return this.InternalInsertIntoAsync(tableName, select); + for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; + return this.InternalInsertIntoAsync(tableName, select?.Body); + } + + async Task ISelect.AnyAsync(Expression> exp) + { + if (exp == null) return await this.AnyAsync(); + for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; + var oldwhere = _where.ToString(); + var ret = await this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); + _where.Clear().Append(oldwhere); + return ret; + } async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).Limit(1).ToListAsync(select)).FirstOrDefault(); async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).Limit(1).ToListAsync(select)).FirstOrDefault();