From 487913f7ef5db4fa5f0d99dbbb259501143170bc Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Fri, 10 Dec 2021 12:17:58 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=AE=8C=E5=96=84=20DynamicFilter=20Custom?=
=?UTF-8?q?=20=E5=AE=89=E5=85=A8=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql.DbContext/FreeSql.DbContext.xml | 9 +
.../Sqlite/Curd/SqliteSelectTest.cs | 1 +
FreeSql/FreeSql.xml | 189 ++++++++++++++++++
.../SelectProvider/Select0Provider.cs | 20 +-
FreeSql/Internal/Model/DynamicFilterInfo.cs | 7 +
5 files changed, 224 insertions(+), 2 deletions(-)
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index da7ace6b..bdd16ff9 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -538,5 +538,14 @@
+
+
+ 批量注入 Repository，可以参考代码自行调整
+
+
+
+
+
+
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
index 664d16df..ca88f326 100644
--- a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
@@ -2543,6 +2543,7 @@ WHERE (((name,no) in (('testname01','testname01')) OR not((a.""no"") LIKE '%test
public class DynamicFilterMyCustom
{
+ [DynamicFilterCustom]
public static string MyRawSql(string value) => value;
public static string TupleIn(string value)
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 87f6f465..6844ebf9 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -3186,6 +3186,177 @@
+
+
+ 测试数据库是否连接正确，本方法执行如下命令：
+ 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>
+
+
+
+
+
+
+
+
可自定义解析表达式
@@ -4020,11 +4191,17 @@
{
public class DynamicFilterCustom
{
+ [DynamicFilterCustom]
public static string RawSql(string value) => value;
}
}
+
+
+ 授权 DynamicFilter 支持 Custom 自定义解析
+
+
是否放弃继续读取
@@ -4074,6 +4251,12 @@
超时
+
+
+ 获取资源
+
+
+
使用完毕后，归还资源
@@ -4144,6 +4327,12 @@
资源对象
+
+
+ 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
+
+ 资源对象
+
归还对象给对象池的时候触发
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
index a5b2d3e1..ae460df8 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -553,9 +553,10 @@ namespace FreeSql.Internal.CommonProvider
if (string.IsNullOrWhiteSpace(fiValueCustomArray[0])) throw new ArgumentException("Custom {静态方法名}不能为空，格式：{静态方法名}{空格}{反射信息}");
if (string.IsNullOrWhiteSpace(fiValueCustomArray[1])) throw new ArgumentException("Custom {反射信息}不能为空，格式：{静态方法名}{空格}{反射信息}");
var fiValue1Type = Type.GetType(fiValueCustomArray[1]);
- if (fiValue1Type == null) throw new ArgumentException($"Custom 找到对应的{{反射信息}}：{fiValueCustomArray[1]}");
+ if (fiValue1Type == null) throw new ArgumentException($"Custom 找不到对应的{{反射信息}}：{fiValueCustomArray[1]}");
var fiValue0Method = fiValue1Type.GetMethod(fiValueCustomArray[0], new Type[] { typeof(string) });
- if (fiValue0Method == null) throw new ArgumentException($"Custom 找到对应的{{静态方法名}}：{fiValueCustomArray[0]}");
+ if (fiValue0Method == null) throw new ArgumentException($"Custom 找不到对应的{{静态方法名}}：{fiValueCustomArray[0]}");
+ if (MethodIsDynamicFilterCustomAttribute(fiValue0Method) == false) throw new ArgumentException($"Custom 对应的{{静态方法名}}：{fiValueCustomArray[0]} 未设置 [DynamicFilterCustomAttribute] 特性");
var fiValue0MethodReturn = fiValue0Method?.Invoke(null, new object[] { fi.Value?.ToString() })?.ToString();
exp = Expression.Call(typeof(SqlExt).GetMethod("InternalRawSql", BindingFlags.NonPublic | BindingFlags.Static), Expression.Constant(fiValue0MethodReturn, typeof(string)));
break;
@@ -693,6 +694,21 @@ namespace FreeSql.Internal.CommonProvider
string.IsNullOrEmpty(testFilter.Value?.ToString());
}
}
+ static ConcurrentDictionary _dicMethodIsDynamicFilterCustomAttribute = new ConcurrentDictionary();
+ static bool MethodIsDynamicFilterCustomAttribute(MethodInfo method) => _dicMethodIsDynamicFilterCustomAttribute.GetOrAdd(method, m =>
+ {
+ object[] attrs = null;
+ try
+ {
+ attrs = m.GetCustomAttributes(false).ToArray(); //.net core 反射存在版本冲突问题，导致该方法异常
+ }
+ catch { }
+
+ var dyattr = attrs?.Where(a => {
+ return ((a as Attribute)?.TypeId as Type)?.Name == "DynamicFilterCustomAttribute";
+ }).FirstOrDefault();
+ return dyattr != null;
+ });
public TSelect DisableGlobalFilter(params string[] name)
{
diff --git a/FreeSql/Internal/Model/DynamicFilterInfo.cs b/FreeSql/Internal/Model/DynamicFilterInfo.cs
index df51b953..7b025e76 100644
--- a/FreeSql/Internal/Model/DynamicFilterInfo.cs
+++ b/FreeSql/Internal/Model/DynamicFilterInfo.cs
@@ -131,10 +131,17 @@ namespace FreeSql.Internal.Model
/// {
/// public class DynamicFilterCustom
/// {
+ /// [DynamicFilterCustom]
/// public static string RawSql(string value) => value;
/// }
/// }
///
Custom
}
+
+ ///
+ /// 授权 DynamicFilter 支持 Custom 自定义解析
+ ///
+ [AttributeUsage(AttributeTargets.Method)]
+ public class DynamicFilterCustomAttribute : Attribute { }
}