From 35ea431470d8fa5cd67e54aababd5444d6f15b78 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Fri, 31 Jul 2020 03:46:13 +0800
Subject: [PATCH] update tests
---
FreeSql.DbContext/FreeSql.DbContext.xml | 9 +
.../Dameng/Curd/DamengSelectTest.cs | 9 +
.../Dameng/Curd/DamengSelectTest.cs | 9 +
FreeSql/FreeSql.xml | 310 ++++++++----------
4 files changed, 170 insertions(+), 167 deletions(-)
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 474ea8d5..4854f49c 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -486,5 +486,14 @@
+
+
+ 批量注入 Repository，可以参考代码自行调整
+
+
+
+
+
+
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/Curd/DamengSelectTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/Curd/DamengSelectTest.cs
index a3cead83..f1705d77 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/Curd/DamengSelectTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/Curd/DamengSelectTest.cs
@@ -1076,6 +1076,11 @@ WHERE (((to_char(a.""ID"")) in (SELECT b.""TITLE""
[Fact]
public void Include_OneToMany()
{
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+
var model1 = new TiOtmModel1 { m1name = DateTime.Now.Second.ToString() };
model1.id = (int)g.dameng.Insert(model1).ExecuteIdentity();
var model2 = new TiOtmModel2 { model2id = model1.id, m2setting = DateTime.Now.Second.ToString() };
@@ -1194,6 +1199,10 @@ WHERE (((to_char(a.""ID"")) in (SELECT b.""TITLE""
[Fact]
public void Include_OneToMany2()
{
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+
string setting = "x";
var model2 = new TiOtmModel22 { m2setting = DateTime.Now.Second.ToString(), aaa = "aaa" + DateTime.Now.Second, bbb = "bbb" + DateTime.Now.Second };
model2.id = (int)g.dameng.Insert(model2).ExecuteIdentity();
diff --git a/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengSelectTest.cs b/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengSelectTest.cs
index a3a9400f..bb33c0bb 100644
--- a/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengSelectTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengSelectTest.cs
@@ -1077,6 +1077,11 @@ WHERE (((to_char(a.""ID"")) in (SELECT b.""TITLE""
[Fact]
public void Include_OneToMany()
{
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+
var model1 = new TiOtmModel1 { m1name = DateTime.Now.Second.ToString() };
model1.id = (int)g.dameng.Insert(model1).ExecuteIdentity();
var model2 = new TiOtmModel2 { model2id = model1.id, m2setting = DateTime.Now.Second.ToString() };
@@ -1195,6 +1200,10 @@ WHERE (((to_char(a.""ID"")) in (SELECT b.""TITLE""
[Fact]
public void Include_OneToMany2()
{
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+ g.dameng.Delete().Where("1=1").ExecuteAffrows();
+
string setting = "x";
var model2 = new TiOtmModel22 { m2setting = DateTime.Now.Second.ToString(), aaa = "aaa" + DateTime.Now.Second, bbb = "bbb" + DateTime.Now.Second };
model2.id = (int)g.dameng.Insert(model2).ExecuteIdentity();
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 7feb5fa9..1f38c4cd 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -2564,6 +2564,137 @@
+
+
+ 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
+
+
+
+
+
+
+
+
+ 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+ 查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+ 查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+ 查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })
+
+
+
+
+
+
+
+ 在【主库】执行
+
+
+
+
+
+
+
+ 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })
+
+
+
+
+
+
+
+ 在【主库】执行
+
+
+
+
+
+
+
+ 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })
+
+
+
+
+
+
+
+ 执行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 })
+
+
+
+
+
+
+
+
+ 执行SQL返回对象集合，Query<User>("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
+
+
+
+
+
+
+
+
+
+ 执行SQL返回对象集合，Query<User>("select * from user where age > ?age; select * from address", new { age = 25 })
+
+
+
+
+
+
可自定义解析表达式
@@ -3233,6 +3364,12 @@
超时
+
+
+ 获取资源
+
+
+
使用完毕后，归还资源
@@ -3303,6 +3440,12 @@
资源对象
+
+
+ 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
+
+ 资源对象
+
归还对象给对象池的时候触发
@@ -3960,171 +4103,4 @@
-
-
-
-
- 使用 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 条件
-
-
-