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

## v0.5.3

Browse Source 
- 增加 ISelect.ToList(true) 自动贪婪加载 LeftJoin/InnerJoin/RightJoin 导航数据；#35
- 增加 IAdo.Query<T1, T2 ...> 多结果集查询；
- 增加 IAdo.ExecuteDataSet 多结果集查询；
- 优化 未设置实体属性 set 的将被自动过滤 IsIgnore；
This commit is contained in:
28810
2019-04-22 18:34:05 +08:00
parent 58e8771a15
commit 9dd85f33f9
23 changed files with 169 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,8 +259,7 @@ namespace FreeSql.Internal.CommonProvider {
return ret;
});
}
public List<T1> ToList() {
var af = this.GetAllFieldExpressionTree();
List<T1> ToListPrivate(GetAllFieldExpressionTreeInfo af) {
var sql = this.ToSql(af.Field);
if (_cache.seconds > 0 && string.IsNullOrEmpty(_cache.key)) _cache.key = $"{sql}{string.Join("|", _params.Select(a => a.Value))}";
@@ -274,8 +273,7 @@ namespace FreeSql.Internal.CommonProvider {
return ret;
});
}
async public Task<List<T1>> ToListAsync() {
var af = this.GetAllFieldExpressionTree();
async Task<List<T1>> ToListPrivateAsync(GetAllFieldExpressionTreeInfo af) {
var sql = this.ToSql(af.Field);
if (_cache.seconds > 0 && string.IsNullOrEmpty(_cache.key)) _cache.key = $"{sql}{string.Join("|", _params.Select(a => a.Value))}";
@@ -290,6 +288,8 @@ namespace FreeSql.Internal.CommonProvider {
return ret;
});
}
public List<T1> ToList(bool includeNestedMembers = false) => this.ToListPrivate(includeNestedMembers == false ? this.GetAllFieldExpressionTreeLevel2() : this.GetAllFieldExpressionTreeLevel2());
public Task<List<T1>> ToListAsync(bool includeNestedMembers = false) => this.ToListPrivateAsync(includeNestedMembers == false ? this.GetAllFieldExpressionTreeLevel2() : this.GetAllFieldExpressionTreeLevel2());
public T1 ToOne() {
this.Limit(1);
return this.ToList().FirstOrDefault();
@@ -349,7 +349,7 @@ namespace FreeSql.Internal.CommonProvider {
public string Field { get; set; }
public Func<IFreeSql, DbDataReader, T1> Read { get; set; }
}
protected GetAllFieldExpressionTreeInfo GetAllFieldExpressionTree() {
protected GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevelAll() {
return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Alias}-{a.Type}")), s => {
var type = _tables.First().Table.TypeLazy ?? _tables.First().Table.Type;
var ormExp = Expression.Parameter(typeof(IFreeSql), "orm");
@@ -379,6 +379,7 @@ namespace FreeSql.Internal.CommonProvider {
if (tbiindex > 0 && tbi.Alias.StartsWith($"{tb.Alias}__") == false) continue;
var typei = tbi.Table.TypeLazy ?? tbi.Table.Type;
Expression curExp = retExp;
if (tbiindex == 0)
blockExp.AddRange(new Expression[] {
Expression.Assign(readExp, Expression.Call(Utils.MethodExecuteArrayRowReadClassOrTuple, new Expression[] { Expression.Constant(typei), Expression.Constant(null, typeof(int[])), rowExp, dataIndexExp, Expression.Constant(_commonUtils) })),
@@ -393,7 +394,6 @@ namespace FreeSql.Internal.CommonProvider {
});
else {
Expression curExpIfNotNull = Expression.IsTrue(Expression.Constant(true));
Expression curExp = retExp;
var curTb = tb;
var parentNameSplits = tbi.Alias.Split(new[] { "__" }, StringSplitOptions.None);
var iscontinue = false;
@@ -435,11 +435,12 @@ namespace FreeSql.Internal.CommonProvider {
)
);
}
if (tbi.Table.TypeLazy != null)
blockExp.Add(
Expression.IfThen(
Expression.NotEqual(readExpValue, Expression.Constant(null)),
Expression.Call(retExp, tbi.Table.TypeLazySetOrm, ormExp)
Expression.Call(Expression.TypeAs(readExpValue, typei), tbi.Table.TypeLazySetOrm, ormExp)
)
); //将 orm 传递给 lazy

4
FreeSql/Internal/UtilsExpressionTree.cs
View File

@@ -48,13 +48,14 @@ namespace FreeSql.Internal {
var propsLazy = new List<(PropertyInfo, bool, bool)>();
var propsNavObjs = new List<PropertyInfo>();
foreach (var p in trytb.Properties.Values) {
var setMethod = trytb.Type.GetMethod($"set_{p.Name}");
var tp = common.CodeFirst.GetDbInfo(p.PropertyType);
//if (tp == null) continue;
var colattr = common.GetEntityColumnAttribute(entity, p);
if (tp == null && colattr == null) {
if (common.CodeFirst.IsLazyLoading) {
var getIsVirtual = trytb.Type.GetMethod($"get_{p.Name}")?.IsVirtual;
var setIsVirtual = trytb.Type.GetMethod($"set_{p.Name}")?.IsVirtual;
var setIsVirtual = setMethod?.IsVirtual;
if (getIsVirtual == true || setIsVirtual == true)
propsLazy.Add((p, getIsVirtual == true, setIsVirtual == true));
}
@@ -96,6 +97,7 @@ namespace FreeSql.Internal {
colattr.DbDefautValue = Activator.CreateInstance(p.PropertyType.IsNullableType() ? p.PropertyType.GenericTypeArguments.FirstOrDefault() : p.PropertyType);
if (colattr.IsIdentity == true && p.PropertyType.IsNumberType() == false)
colattr.IsIdentity = false;
if (setMethod == null) colattr.IsIgnore = true;
var col = new ColumnInfo {
Table = trytb,