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

## v0.3.22

Browse Source 
- 优化 导航属性 ManyToOne 名称查找规则；
- 增加 IFreeSql.Aop 属性，未来所有拦截方法都在这里，第一期支持如下：
  * 监控 ToList 返回的的数据，用于拦截重新装饰；
  * 监视 Where，包括 select/update/delete，返回值 true 时可使上层不被执行；
  * 可自定义解析表达式；
- 增加 ISelect.TractToList，用于单次跟踪或审核实体；
- 优化 FreeSql.DbContext SaveChanges；
This commit is contained in:
28810
2019-03-22 00:26:08 +08:00
parent c20a0bbd54
commit 7f3aa84ffe
27 changed files with 720 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
FreeSql/Internal/CommonProvider/AopProvider.cs Normal file
View File

@ -0,0 +1,13 @@

using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Text;
namespace FreeSql.Internal.CommonProvider {
class AopProvider : IAop {
public EventHandler<AopToListEventArgs> ToList { get; set; }
public EventHandler<AopWhereEventArgs> Where { get; set; }
public EventHandler<AopParseExpressionEventArgs> ParseExpression { get; set; }
}
}

4
FreeSql/Internal/CommonProvider/DeleteProvider.cs
View File

@ -51,6 +51,10 @@ namespace FreeSql.Internal.CommonProvider {
public IDelete<T1> Where(Expression<Func<T1, bool>> exp) => this.Where(_commonExpression.ExpressionWhereLambdaNoneForeignObject(null, null, exp?.Body, null));
public IDelete<T1> Where(string sql, object parms = null) {
if (string.IsNullOrEmpty(sql)) return this;
var args = new AopWhereEventArgs(sql, parms);
_orm.Aop.Where?.Invoke(this, new AopWhereEventArgs(sql, parms));
if (args.IsCancel == true) return this;
if (++_whereTimes > 1) _where.Append(" AND ");
_where.Append("(").Append(sql).Append(")");
if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));

23
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@ -28,6 +28,7 @@ namespace FreeSql.Internal.CommonProvider {
protected CommonUtils _commonUtils;
protected CommonExpression _commonExpression;
protected DbTransaction _transaction;
protected Action<object> _trackToList;
internal static void CopyData(Select0Provider<TSelect, T1> from, object to, ReadOnlyCollection<ParameterExpression> lambParms) {
var toType = to?.GetType();
@ -60,6 +61,7 @@ namespace FreeSql.Internal.CommonProvider {
//toType.GetField("_commonUtils", BindingFlags.Instance | BindingFlags.NonPublic)?.SetValue(to, from._commonUtils);
//toType.GetField("_commonExpression", BindingFlags.Instance | BindingFlags.NonPublic)?.SetValue(to, from._commonExpression);
toType.GetField("_transaction", BindingFlags.Instance | BindingFlags.NonPublic)?.SetValue(to, from._transaction);
toType.GetField("_trackToList", BindingFlags.Instance | BindingFlags.NonPublic)?.SetValue(to, from._trackToList);
}
public Select0Provider(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) {
@ -71,6 +73,11 @@ namespace FreeSql.Internal.CommonProvider {
if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure<T1>();
}
public TSelect TrackToList(Action<object> track) {
_trackToList = track;
return this as TSelect;
}
public TSelect WithTransaction(DbTransaction transaction) {
_transaction = transaction;
return this as TSelect;
@ -215,6 +222,8 @@ namespace FreeSql.Internal.CommonProvider {
var read = Utils.ExecuteArrayRowReadClassOrTuple(type, null, dr, 0, _commonUtils);
ret.Add((TTuple)read.Value);
}, CommandType.Text, sql, _params.ToArray());
_orm.Aop.ToList?.Invoke(this, new AopToListEventArgs(ret));
_trackToList?.Invoke(ret);
return ret;
});
}
@ -230,6 +239,8 @@ namespace FreeSql.Internal.CommonProvider {
ret.Add((TTuple)read.Value);
return Task.CompletedTask;
}, CommandType.Text, sql, _params.ToArray());
_orm.Aop.ToList?.Invoke(this, new AopToListEventArgs(ret));
_trackToList?.Invoke(ret);
return ret;
});
}
@ -243,6 +254,8 @@ namespace FreeSql.Internal.CommonProvider {
_orm.Ado.ExecuteReader(_transaction, dr => {
ret.Add(af.Read(dr));
}, CommandType.Text, sql, _params.ToArray());
_orm.Aop.ToList?.Invoke(this, new AopToListEventArgs(ret));
_trackToList?.Invoke(ret);
return ret;
});
}
@ -257,6 +270,8 @@ namespace FreeSql.Internal.CommonProvider {
ret.Add(af.Read(dr));
return Task.CompletedTask;
}, CommandType.Text, sql, _params.ToArray());
_orm.Aop.ToList?.Invoke(this, new AopToListEventArgs(ret));
_trackToList?.Invoke(ret);
return ret;
});
}
@ -283,6 +298,8 @@ namespace FreeSql.Internal.CommonProvider {
var index = -1;
ret.Add((TReturn)_commonExpression.ReadAnonymous(af.map, dr, ref index, false));
}, CommandType.Text, sql, _params.ToArray());
_orm.Aop.ToList?.Invoke(this, new AopToListEventArgs(ret));
_trackToList?.Invoke(ret);
return ret;
});
}
@ -298,6 +315,8 @@ namespace FreeSql.Internal.CommonProvider {
ret.Add((TReturn)_commonExpression.ReadAnonymous(af.map, dr, ref index, false));
return Task.CompletedTask;
}, CommandType.Text, sql, _params.ToArray());
_orm.Aop.ToList?.Invoke(this, new AopToListEventArgs(ret));
_trackToList?.Invoke(ret);
return ret;
});
}
@ -480,6 +499,10 @@ namespace FreeSql.Internal.CommonProvider {
public TSelect Where(string sql, object parms = null) => this.WhereIf(true, sql, parms);
public TSelect WhereIf(bool condition, string sql, object parms = null) {
if (condition == false || string.IsNullOrEmpty(sql)) return this as TSelect;
var args = new AopWhereEventArgs(sql, parms);
_orm.Aop.Where?.Invoke(this, new AopWhereEventArgs(sql, parms));
if (args.IsCancel == true) return this as TSelect;
_where.Append(" AND (").Append(sql).Append(")");
if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
return this as TSelect;

2
FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
View File

@ -79,7 +79,5 @@ namespace FreeSql.Internal.CommonProvider {
var method = _select.GetType().GetMethod("ToSql", new[] { typeof(string) });
return method.Invoke(_select, new object[] { field.Length > 0 ? field.Remove(0, 2).ToString() : null }) as string;
}
}
}

4
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@ -117,6 +117,10 @@ namespace FreeSql.Internal.CommonProvider {
public IUpdate<T1> Where(Expression<Func<T1, bool>> expression) => this.Where(_commonExpression.ExpressionWhereLambdaNoneForeignObject(null, null, expression?.Body, null));
public IUpdate<T1> Where(string sql, object parms = null) {
if (string.IsNullOrEmpty(sql)) return this;
var args = new AopWhereEventArgs(sql, parms);
_orm.Aop.Where?.Invoke(this, new AopWhereEventArgs(sql, parms));
if (args.IsCancel == true) return this;
_where.Append(" AND (").Append(sql).Append(")");
if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
return this;