From 991ea968fc7723bbd2e3871b7e098c821282876c Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Fri, 29 Jul 2022 18:44:23 +0800 Subject: [PATCH] v3.2.666-preview20220801 #1199 --- Directory.Build.props | 2 +- FreeSql-mini.sln => FreeSql-lite.sln | 0 FreeSql.DbContext/FreeSql.DbContext.xml | 18 ------------------ FreeSql/Internal/CommonExpression.cs | 5 ++--- 4 files changed, 3 insertions(+), 22 deletions(-) rename FreeSql-mini.sln => FreeSql-lite.sln (100%) diff --git a/Directory.Build.props b/Directory.Build.props index c85143ac..9cbf9075 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,7 +9,7 @@ - 3.2.666-preview20220731 + 3.2.666-preview20220801 diff --git a/FreeSql-mini.sln b/FreeSql-lite.sln similarity index 100% rename from FreeSql-mini.sln rename to FreeSql-lite.sln diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 26522f10..594fbad3 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -733,15 +733,6 @@ - - - 根据Assembly扫描所有继承IEntityTypeConfiguration<T>的配置类 - - - - - - 创建普通数据上下文档对象 @@ -800,14 +791,5 @@ - - - 批量注入 Repository,可以参考代码自行调整 - - - - - - diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs index fc78ea0d..f0601e3b 100644 --- a/FreeSql/Internal/CommonExpression.cs +++ b/FreeSql/Internal/CommonExpression.cs @@ -2352,7 +2352,7 @@ namespace FreeSql.Internal var mtmReftbname = e.FreeParse(Expression.MakeMemberAccess(memberExp.Expression, exp3Tb.Properties[exp3Tb.ColumnsByPosition[0].CsName])); mtmReftbname = mtmReftbname.Substring(0, mtmReftbname.Length - commonExp._common.QuoteSqlName(exp3Tb.ColumnsByPosition[0].Attribute.Name).Length - 1); var midSelect = commonExp._common._orm.Select().As($"M{select._tables[0].Alias}_M{mtmReftbname}").AsType(memberTbref.RefMiddleEntityType) as Select1Provider; - select._tableRules.ForEach(o => midSelect.AsTable(o)); + if (tableRule != null) midSelect._tableRules.Add(tableRule); switch (commonExp._ado.DataType) { case DataType.Oracle: @@ -2409,8 +2409,7 @@ namespace FreeSql.Internal Type = SelectTableInfoType.Parent, Parameter = a.Parameter })); - if (tableRule != null) - select._tableRules.Add(tableRule); + if (tableRule != null) select._tableRules.Add(tableRule); } while (true) {