From beb2eaada2002a0bd98542a37471d5d1171993c8 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Sat, 5 Sep 2020 06:50:56 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=20GlobalFilter.ApplyIf?=
=?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E5=8A=A8=E6=80=81=E8=BF=87=E6=BB=A4?=
=?UTF-8?q?=E5=99=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql.DbContext/FreeSql.DbContext.xml | 9 --
FreeSql.Tests/FreeSql.Tests/UnitTest2.cs | 6 +
FreeSql/FreeSql.xml | 174 ++++++++++++++++++++++-
FreeSql/Internal/GlobalFilter.cs | 21 ++-
4 files changed, 196 insertions(+), 14 deletions(-)
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 743835e4..9c6cd88b 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -532,14 +532,5 @@
-
-
- 批量注入 Repository，可以参考代码自行调整
-
-
-
-
-
-
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest2.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest2.cs
index a5b2757e..16d3d8ea 100644
--- a/FreeSql.Tests/FreeSql.Tests/UnitTest2.cs
+++ b/FreeSql.Tests/FreeSql.Tests/UnitTest2.cs
@@ -280,6 +280,12 @@ namespace FreeSql.Tests
var kwrepo = g.sqlite.GetRepository();
kwrepo.Insert(u1);
+ g.sqlite.GlobalFilter.ApplyIf("random_filter", () => new Random().Next(0, 2) % 2 == 0 ? true : false, a => a.rowstate > 0);
+
+ Enumerable.Range(0, 10).ToList().ForEach(aidx =>
+ {
+ var sql1 = g.sqlite.Select().ToSql();
+ });
g.sqlite.GlobalFilter.Apply("gft1", a => a.rowstate > -1 && g.sqlite.Select().Any(b => b.id == a.id))
.Apply("gft2", a => a.rowstate > -2)
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index fd1680d0..8af604f0 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -2983,6 +2983,153 @@
+
+
+ 测试数据库是否连接正确，本方法执行如下命令：
+ 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>
+
+
+
+
+
+
可自定义解析表达式
@@ -3536,13 +3683,26 @@
- 创建一个过滤器
+ 创建一个过滤器
+ 提示：判断登陆身份，请参考资料 AsyncLocal
名字
表达式
+
+
+ 创建一个动态过滤器，当 condition 返回值为 true 时才生效
+ 场景：当登陆身份是管理员，则过滤条件不生效
+ 提示：判断登陆身份，请参考资料 AsyncLocal
+
+
+ 名字
+ 委托，返回值为 true 时才生效
+ 表达式
+
+
当前操作的数据
@@ -3739,6 +3899,12 @@
超时
+
+
+ 获取资源
+
+
+
使用完毕后，归还资源
@@ -3809,6 +3975,12 @@
资源对象
+
+
+ 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
+
+ 资源对象
+
归还对象给对象池的时候触发
diff --git a/FreeSql/Internal/GlobalFilter.cs b/FreeSql/Internal/GlobalFilter.cs
index f0250d8b..9da950ff 100644
--- a/FreeSql/Internal/GlobalFilter.cs
+++ b/FreeSql/Internal/GlobalFilter.cs
@@ -16,22 +16,35 @@ namespace FreeSql.Internal
{
public int Id { get; internal set; }
public string Name { get; internal set; }
+ internal Func Condition { get; set; }
public LambdaExpression Where { get; internal set; }
}
///
- /// 创建一个过滤器
+ /// 创建一个过滤器
+ /// 提示：判断登陆身份，请参考资料 AsyncLocal
///
///
/// 名字
/// 表达式
///
- public GlobalFilter Apply(string name, Expression> where)
+ public GlobalFilter Apply(string name, Expression> where) => ApplyIf(name, () => true, where);
+ ///
+ /// 创建一个动态过滤器，当 condition 返回值为 true 时才生效
+ /// 场景：当登陆身份是管理员，则过滤条件不生效
+ /// 提示：判断登陆身份，请参考资料 AsyncLocal
+ ///
+ ///
+ /// 名字
+ /// 委托，返回值为 true 时才生效
+ /// 表达式
+ ///
+ public GlobalFilter ApplyIf(string name, Func condition, Expression> where)
{
if (name == null) throw new ArgumentNullException(nameof(name));
if (where == null) return this;
_filters.TryGetValue(name, out var item);
- if (item == null) item = new Item { Id = ++_id, Name = name };
+ if (item == null) item = new Item { Id = ++_id, Name = name, Condition = condition };
var newParameter = Expression.Parameter(typeof(TEntity), $"gf{_id}");
var newlambda = Expression.Lambda>(
@@ -44,6 +57,6 @@ namespace FreeSql.Internal
}
public void Remove(string name) => _filters.TryRemove(name ?? throw new ArgumentNullException(nameof(name)), out var _);
- public List- GetFilters() => _filters.Values.OrderBy(a => a.Id).ToList();
+ public List
- GetFilters() => _filters.Values.Where(a => a.Condition?.Invoke() != false).OrderBy(a => a.Id).ToList();
}
}