From 4b2887f6075b267fcd3ed8457552280e92aaf04d Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Thu, 23 Jan 2020 15:53:11 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20=E7=88=B6=E5=AD=90?=
=?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=AF=BC=E8=88=AA=E5=B1=9E=E6=80=A7=20Dto=20?=
=?UTF-8?q?=E4=B8=AD=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=20a.Parent=20?=
=?UTF-8?q?=E6=98=A0=E5=B0=84=E9=94=99=E8=AF=AF=E7=9A=84=20bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql.DbContext/FreeSql.DbContext.xml | 7 -----
FreeSql/Internal/CommonExpression.cs | 3 ++-
readme.md | 34 ++++++-------------------
3 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index d9f91124..dc0203b8 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -110,13 +110,6 @@
清空状态数据
-
-
- 根据 lambda 条件删除数据
-
-
-
-
添加
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
index 7abfdcab..d5896cd6 100644
--- a/FreeSql/Internal/CommonExpression.cs
+++ b/FreeSql/Internal/CommonExpression.cs
@@ -1109,7 +1109,8 @@ namespace FreeSql.Internal
var finds = new SelectTableInfo[0];
if (tsc.style == ExpressionStyle.SelectColumns)
{
- finds = tsc._tables.Where(a => a.Table.Type == tbtmp.Type).ToArray();
+ finds = tsc._tables.Where(a => a.Table.Type == tbtmp.Type && a.Alias == alias).ToArray();
+ if (finds.Length != 1) finds = tsc._tables.Where(a => a.Table.Type == tbtmp.Type).ToArray();
if (finds.Any()) finds = new[] { finds.First() };
}
if (finds.Length != 1 && isa && parmExp != null)
diff --git a/readme.md b/readme.md
index 23027015..43603321 100644
--- a/readme.md
+++ b/readme.md
@@ -215,30 +215,6 @@ using (var ctx = new fsql.CreateDbContext()) {
}
```
-# DataFilter & Tenant
-
-```csharp
-public void ConfigureServices(IServiceCollection services) {
- services.AddSingleton(Fsql);
- services.AddFreeRepository(filter => filter
- .Apply("SoftDelete", a => a.IsDeleted == false)
- .Apply("Tenant", a => a.TenantId == 1)
- ,
- this.GetType().Assembly
- );
-}
-```
-
-Temporary disable:
-```csharp
-var repoq = fsql.GetRepository();
-
-using (repo1.DataFilter.Disable("Tenant")) {
- //Tenant Invalid
-}
-//Tenant restore
-```
-
# Performance
FreeSql Query & Dapper Query
@@ -265,7 +241,7 @@ Elapsed: 00:00:00.6707125; ToList Entity Counts: 131072; ORM: FreeSql*
Elapsed: 00:00:00.6495301; Query Entity Counts: 131072; ORM: Dapper
```
-[Test code](FreeSql.Tests.PerformanceTests/MySqlAdoTest.cs)
+[Test code](FreeSql.Tests.PerformanceTests/MySqlAdoTest.cs)、[More](https://github.com/2881099/FreeSql/wiki/%e6%80%a7%e8%83%bd)
# Contributors
@@ -282,4 +258,10 @@ Elapsed: 00:00:00.6495301; Query Entity Counts: 131072; ORM: Dapper
[hd2y](https://github.com/hd2y)、
[tky753](https://github.com/tky753)
-(QQ群:4336577)
\ No newline at end of file
+(QQ群:4336577)
+
+# Donation
+
+L*y 58元、花花 88 元、麦兜很乖 50元、网络来者 2000元
+
+