- 优化 全局过滤器禁用时子查询传播问题;#1208

This commit is contained in:
2881099
2022-08-09 13:40:39 +08:00
parent 0eea073fae
commit af87020090
4 changed files with 206 additions and 16 deletions

View File

@ -144,6 +144,11 @@
通用卡
</summary>
</member>
<member name="P:FreeSql.Tests.Issues._1208.DoorDeviceEntity.Users">
<summary>
用户
</summary>
</member>
<member name="P:FreeSql.Tests.Issues._467.PayOrder.Money">
<summary>
收款金额

View File

@ -0,0 +1,158 @@
using FreeSql.DataAnnotations;
using System.Collections.Generic;
using System.Linq;
using Xunit;
namespace FreeSql.Tests.Issues
{
public class _1208
{
[Fact]
public void GlobalFilter()
{
using (var fsql = new FreeSqlBuilder()
.UseConnectionString(DataType.Sqlite, "data source=:memory:")
.UseAutoSyncStructure(true)
.Build())
{
fsql.GlobalFilter.Apply<UserEntity>("TenantQuery", a => a.TenantId == 100);
var userRepository = fsql.GetRepository<UserEntity>();
var deviceId = 100;
var sql = userRepository.Select
.Where(i => i.DoorDevices.AsSelect().Any(x => x.Id == deviceId))
.OrderByDescending(true, a => a.Id)
.ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""TenantId""
FROM ""issues1208_User"" a
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDeviceUser"" Mx_Mi
WHERE (Mx_Mi.""UserId"" = a.""Id"") AND (exists(SELECT 1
FROM ""issues1208_DoorDevice"" x
WHERE (x.""Id"" = 100) AND (x.""Id"" = Mx_Mi.""DoorDeviceId"") AND (x.""TenantId"" = 100)
limit 0,1)) AND (Mx_Mi.""TenantId"" = 100)
limit 0,1)) AND (a.""TenantId"" = 100)
ORDER BY a.""Id"" DESC", sql);
sql = userRepository.Select
.Where(i => i.DoorDevices.AsSelect().DisableGlobalFilter("TenantQuery").Any(x => x.Id == deviceId))
.OrderByDescending(true, a => a.Id)
.ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""TenantId""
FROM ""issues1208_User"" a
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDeviceUser"" Mx_Mi
WHERE (Mx_Mi.""UserId"" = a.""Id"") AND (exists(SELECT 1
FROM ""issues1208_DoorDevice"" x
WHERE (x.""Id"" = 100) AND (x.""Id"" = Mx_Mi.""DoorDeviceId"")
limit 0,1))
limit 0,1)) AND (a.""TenantId"" = 100)
ORDER BY a.""Id"" DESC", sql);
sql = userRepository.Select.DisableGlobalFilter("TenantQuery")
.Where(i => i.DoorDevices.AsSelect().Any(x => x.Id == deviceId))
.OrderByDescending(true, a => a.Id)
.ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""TenantId""
FROM ""issues1208_User"" a
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDeviceUser"" Mx_Mi
WHERE (Mx_Mi.""UserId"" = a.""Id"") AND (exists(SELECT 1
FROM ""issues1208_DoorDevice"" x
WHERE (x.""Id"" = 100) AND (x.""Id"" = Mx_Mi.""DoorDeviceId"")
limit 0,1))
limit 0,1))
ORDER BY a.""Id"" DESC", sql);
using (userRepository.DataFilter.Disable("TenantQuery"))
{
sql = userRepository.Select
.Where(i => i.DoorDevices.AsSelect().Any(x => x.Id == deviceId))
.OrderByDescending(true, a => a.Id)
.ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""TenantId""
FROM ""issues1208_User"" a
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDeviceUser"" Mx_Mi
WHERE (Mx_Mi.""UserId"" = a.""Id"") AND (exists(SELECT 1
FROM ""issues1208_DoorDevice"" x
WHERE (x.""Id"" = 100) AND (x.""Id"" = Mx_Mi.""DoorDeviceId"")
limit 0,1))
limit 0,1))
ORDER BY a.""Id"" DESC", sql);
}
sql = userRepository.Select
.Where(i => i.DoorDevices.Any(x => x.Id == deviceId))
.OrderByDescending(true, a => a.Id)
.ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""TenantId""
FROM ""issues1208_User"" a
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDevice"" x
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDeviceUser"" Mx_Ma
WHERE (Mx_Ma.""DoorDeviceId"" = x.""Id"") AND (Mx_Ma.""UserId"" = a.""Id"") AND (Mx_Ma.""TenantId"" = 100)
limit 0,1)) AND (x.""Id"" = 100) AND (x.""TenantId"" = 100)
limit 0,1)) AND (a.""TenantId"" = 100)
ORDER BY a.""Id"" DESC", sql);
sql = userRepository.Select.DisableGlobalFilter("TenantQuery")
.Where(i => i.DoorDevices.Any(x => x.Id == deviceId))
.OrderByDescending(true, a => a.Id)
.ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""TenantId""
FROM ""issues1208_User"" a
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDevice"" x
WHERE (exists(SELECT 1
FROM ""issues1208_DoorDeviceUser"" Mx_Ma
WHERE (Mx_Ma.""DoorDeviceId"" = x.""Id"") AND (Mx_Ma.""UserId"" = a.""Id"")
limit 0,1)) AND (x.""Id"" = 100)
limit 0,1))
ORDER BY a.""Id"" DESC", sql);
}
}
[Table(Name = "issues1208_User")]
class UserEntity
{
[Column(IsIdentity = true)]
public int Id { get; set; }
[Navigate(ManyToMany = typeof(DoorDeviceUserEntity))]
public ICollection<DoorDeviceEntity> DoorDevices { get; set; }
public int TenantId { get; set; }
}
[Table(Name = "issues1208_DoorDeviceUser")]
class DoorDeviceUserEntity
{
public int UserId { get; set; }
[Navigate(nameof(UserId))]
public UserEntity User { get; set; }
public int DoorDeviceId { get; set; }
[Navigate(nameof(DoorDeviceId))]
public DoorDeviceEntity DoorDevice { get; set; }
public int TenantId { get; set; }
}
[Table(Name = "issues1208_DoorDevice")]
class DoorDeviceEntity
{
[Column(IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 用户
/// </summary>
[Navigate(ManyToMany = typeof(DoorDeviceUserEntity))]
public ICollection<UserEntity> Users { get; set; }
public int TenantId { get; set; }
}
}
}