tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

v0.1.14

Browse Source 
- 增加 延时属性编译错误信息；
- 优化 FreeSql.Repository Autofac 泛型注入；
This commit is contained in:
2881099
2019-03-10 21:23:06 +08:00
parent 428220e754
commit ec2fcfb419
11 changed files with 277 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
FreeSql.Repository/DependencyInjection.cs
View File

@ -8,62 +8,123 @@ using System.Reflection;
public static class FreeSqlRepositoryAutofacDependencyInjection {
public static void RegisterFreeGuidRepository<TEntity>(this ContainerBuilder builder, Expression<Func<TEntity, bool>> filter, Func<string, string> asTable) =>
builder.RegisterRepository<TEntity>(filter, asTable, 1);
public static void RegisterFreeRepository<TEntity>(this ContainerBuilder builder, Expression<Func<TEntity, bool>> filter) =>
builder.RegisterRepository<TEntity>(filter, null, 2);
public static void RegisterFreeRepository(this ContainerBuilder builder) => RegisterFreeRepositoryPrivate<bool>(builder, null, null);
public static void RegisterFreeRepositoryAddFilter<TEntity>(this ContainerBuilder builder, Func<Expression<Func<TEntity, bool>>> filterHandler) => RegisterFreeRepositoryPrivate<TEntity>(builder, filterHandler, null);
static void RegisterRepository<TEntity>(this ContainerBuilder builder, Expression<Func<TEntity, bool>> filter, Func<string, string> asTable, int regType) {
static ConcurrentDictionary<Type, Delegate> _dicRegisterFreeRepositorySetFilterFunc = new ConcurrentDictionary<Type, Delegate>();
static ConcurrentDictionary<Type, Delegate> _dicRegisterFreeRepositorySetAsTableFunc = new ConcurrentDictionary<Type, Delegate>();
static void RegisterFreeRepositoryPrivate<TEntity>(ContainerBuilder builder, Func<Expression<Func<TEntity, bool>>> filterHandler, Func<string, string> asTableHandler) {
Func<Type, LambdaExpression> reposFunc = type => {
Func<Type, Delegate> setFilterFunc = reposType => _dicRegisterFreeRepositorySetFilterFunc.GetOrAdd(reposType, type => {
var reposParameter = Expression.Parameter(type);
var fitlerParameter = Expression.Parameter(typeof(Expression<>).MakeGenericType(typeof(Func<,>).MakeGenericType(type.GenericTypeArguments[0], typeof(bool))));
return Expression.Lambda(
Expression.Block(
Expression.Call(reposParameter, type.GetMethod("set_Filter", BindingFlags.Instance | BindingFlags.NonPublic), fitlerParameter)
),
new[] {
reposParameter, fitlerParameter
}
).Compile();
});
Func<Type, LambdaExpression> convertFilter = type => {
var filter = filterHandler?.Invoke();
if (filter == null) return null;
var entityType = type.GenericTypeArguments[0];
var filterParameter1 = Expression.Parameter(entityType, filter.Parameters[0].Name);
var convertFilter = Expression.Lambda(
typeof(Func<,>).MakeGenericType(entityType, typeof(bool)),
new ReplaceVisitor<TEntity>().Modify(filter.Body, filterParameter1),
filterParameter1
);
var repos = Expression.Parameter(type);
var blocks = new List<Expression>();
if (filter != null) blocks.Add(Expression.Call(repos, type.GetMethod("set_Filter", BindingFlags.Instance | BindingFlags.NonPublic), Expression.Constant(convertFilter)));
if (asTable != null) blocks.Add(Expression.Call(repos, type.GetMethod("set_AsTable", BindingFlags.Instance | BindingFlags.NonPublic), Expression.Constant(asTable)));
return Expression.Lambda(
//Expression.New(
// typeof(GuidRepository<>).MakeGenericType(type.GenericTypeArguments).GetConstructors()[1],
// Expression.Constant(a.Context.Resolve<IFreeSql>()),
// Expression.Constant(convertFilter),
// Expression.Constant(asTable)
//)
Expression.Block(blocks),
repos
);
try {
return Expression.Lambda(
typeof(Func<,>).MakeGenericType(entityType, typeof(bool)),
new ReplaceVisitor<TEntity>().Modify(filter.Body, filterParameter1),
filterParameter1
);
} catch {
return null;
}
};
if (regType == 1)
builder.RegisterGeneric(typeof(GuidRepository<>)).As(
typeof(GuidRepository<>),
typeof(BaseRepository<>), typeof(BaseRepository<,>),
typeof(IBasicRepository<>), typeof(IBasicRepository<,>),
typeof(IReadOnlyRepository<>), typeof(IReadOnlyRepository<,>)
).OnActivating(a => {
if (filter != null)
_dicAddGuidRepositoryFunc.GetOrAdd(a.Instance.GetType(), t => reposFunc(t).Compile()).DynamicInvoke(a.Instance);
}).InstancePerDependency();
builder.RegisterGeneric(typeof(GuidRepository<>)).As(
typeof(GuidRepository<>),
typeof(BaseRepository<>),
typeof(IBasicRepository<>),
typeof(IReadOnlyRepository<>)
).OnActivating(a => {
if (filterHandler != null) {
var type = a.Instance.GetType();
setFilterFunc(type)?.DynamicInvoke(a.Instance, convertFilter(type));
}
}).InstancePerDependency();
if (regType == 2)
builder.RegisterGeneric(typeof(DefaultRepository<,>)).As(
typeof(DefaultRepository<,>),
typeof(BaseRepository<,>),
typeof(IBasicRepository<,>),
typeof(IReadOnlyRepository<,>)
).OnActivating(a => {
if (filter != null)
_dicAddGuidRepositoryFunc.GetOrAdd(a.Instance.GetType(), t => reposFunc(t).Compile()).DynamicInvoke(a.Instance);
}).InstancePerDependency();
builder.RegisterGeneric(typeof(DefaultRepository<,>)).As(
typeof(DefaultRepository<,>),
typeof(BaseRepository<,>),
typeof(IBasicRepository<,>),
typeof(IReadOnlyRepository<,>)
).OnActivating(a => {
if (filterHandler != null) {
var type = a.Instance.GetType();
setFilterFunc(type)?.DynamicInvoke(a.Instance, convertFilter(type));
}
}).InstancePerDependency();
}
static ConcurrentDictionary<Type, Delegate> _dicAddGuidRepositoryFunc = new ConcurrentDictionary<Type, Delegate>();
//static void RegisterRepository<TEntity>(this ContainerBuilder builder, Expression<Func<TEntity, bool>> filter, Func<string, string> asTable, int regType) {
// Func<Type, LambdaExpression> reposFunc = type => {
// var entityType = type.GenericTypeArguments[0];
// var filterParameter1 = Expression.Parameter(entityType, filter.Parameters[0].Name);
// var convertFilter = Expression.Lambda(
// typeof(Func<,>).MakeGenericType(entityType, typeof(bool)),
// new ReplaceVisitor<TEntity>().Modify(filter.Body, filterParameter1),
// filterParameter1
// );
// var repos = Expression.Parameter(type);
// var blocks = new List<Expression>();
// if (filter != null) blocks.Add(Expression.Call(repos, type.GetMethod("set_Filter", BindingFlags.Instance | BindingFlags.NonPublic), Expression.Constant(convertFilter)));
// if (asTable != null) blocks.Add(Expression.Call(repos, type.GetMethod("set_AsTable", BindingFlags.Instance | BindingFlags.NonPublic), Expression.Constant(asTable)));
// return Expression.Lambda(
// //Expression.New(
// // typeof(GuidRepository<>).MakeGenericType(type.GenericTypeArguments).GetConstructors()[1],
// // Expression.Constant(a.Context.Resolve<IFreeSql>()),
// // Expression.Constant(convertFilter),
// // Expression.Constant(asTable)
// //)
// Expression.Block(blocks),
// repos
// );
// };
// if (regType == 1)
// builder.RegisterGeneric(typeof(GuidRepository<>)).As(
// typeof(GuidRepository<>),
// typeof(BaseRepository<>), typeof(BaseRepository<,>),
// typeof(IBasicRepository<>), typeof(IBasicRepository<,>),
// typeof(IReadOnlyRepository<>), typeof(IReadOnlyRepository<,>)
// ).OnActivating(a => {
// if (filter != null)
// _dicAddGuidRepositoryFunc.GetOrAdd(a.Instance.GetType(), t => {
// try { reposFunc(t).Compile(); } catch { }
// return null;
// })?.DynamicInvoke(a.Instance);
// }).InstancePerDependency();
// if (regType == 2)
// builder.RegisterGeneric(typeof(DefaultRepository<,>)).As(
// typeof(DefaultRepository<,>),
// typeof(BaseRepository<,>),
// typeof(IBasicRepository<,>),
// typeof(IReadOnlyRepository<,>)
// ).OnActivating(a => {
// if (filter != null)
// _dicAddGuidRepositoryFunc.GetOrAdd(a.Instance.GetType(), t => {
// try { reposFunc(t).Compile(); } catch { }
// return null;
// })?.DynamicInvoke(a.Instance);
// }).InstancePerDependency();
//}
//static ConcurrentDictionary<Type, Delegate> _dicAddGuidRepositoryFunc = new ConcurrentDictionary<Type, Delegate>();
class ReplaceVisitor<TEntity1> : ExpressionVisitor {
private ParameterExpression parameter;

2
FreeSql.Repository/FreeSql.Repository.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>0.1.13</Version>
<Version>0.1.14</Version>
<Authors>YeXiangQin</Authors>
<Description>FreeSql 通用仓库层实现，支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite，读写分离、分表分库。</Description>
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>