lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-08-23 22:11:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

db.Queryable(queryable1,queryable2) Filter bug

Browse Source
This commit is contained in:
sunkaixuna 2021-07-19 13:19:26 +08:00
parent 109454c56c
commit 65ea005311
2 changed files with 76 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
Src/Asp.Net/SqlServerTest/UnitTest/UQueryable2.cs
View File

@ -32,12 +32,12 @@ namespace OrmTest
.Mapper(it => it.Items, it => it.Items.First().OrderId)
.Where(it => it.Items.Any())
.ToList();
var list7= Db.Queryable<Order>()
var list7 = Db.Queryable<Order>()
.Mapper(it => it.Items, it => it.Items.First().OrderId)
.Where(it => it.Items.Any(y => y.ItemId == 1))
.ToList();
var sql=Db.Queryable<Order>().AS("[order]").ToList();
var sql = Db.Queryable<Order>().AS("[order]").ToList();
var sql1 = Db.Queryable<Order, OrderItem, Custom>((o, i, c) => new JoinQueryInfos(
JoinType.Left, o.Id == i.OrderId,
@ -67,19 +67,19 @@ namespace OrmTest
Db.Queryable<object>().AS("[order]").Select("*").ToList();
var qu1=Db.Queryable<Order>().Select(it => new
var qu1 = Db.Queryable<Order>().Select(it => new
{
id = it.Id
}).MergeTable().Select<Order>();
var qu2 = Db.Queryable<Order>().Select(it => new
{
id = it.Id,
name=it.Name
name = it.Name
}).MergeTable().Select<Order>();
var list=Db.Queryable(qu1, qu2,JoinType.Left, (x, y) => x.Id == y.Id).Select((x,y) => new
var list = Db.Queryable(qu1, qu2, JoinType.Left, (x, y) => x.Id == y.Id).Select((x, y) => new
{
id1=x.Id,
name=y.Name
id1 = x.Id,
name = y.Name
}).ToList();
var qu3 = Db.Queryable<Order>().Select(it => new
@ -87,49 +87,99 @@ namespace OrmTest
id = it.Id,
name = it.Name
}).MergeTable()
.Where(it=>2>it.id).Select(it=> new Order() {
Id=SqlFunc.IIF(2>it.id,1,2)
.Where(it => 2 > it.id).Select(it => new Order()
{
Id = SqlFunc.IIF(2 > it.id, 1, 2)
}).ToList();
var qu4 = Db.Queryable<Order>().OrderBy(it=>it.Id+it.Id).ToList();
var qu4 = Db.Queryable<Order>().OrderBy(it => it.Id + it.Id).ToList();
var list11 = Db.Queryable<A>()
.ToList();
var list8 = Db.Queryable<A>()
.Mapper<A,B,ABMapping>(it => ManyToMany.Config(it.AId,it.BId))
.Mapper<A, B, ABMapping>(it => ManyToMany.Config(it.AId, it.BId))
.ToList();
Db.CodeFirst.InitTables<ABMap, TableA, TableB>();
Db.DbMaintenance.TruncateTable("TableA");
Db.DbMaintenance.TruncateTable("Tableb");
Db.DbMaintenance.TruncateTable("ABMap");
Db.Insertable(new TableA() { id=1, Name = "A1" }).ExecuteCommand();
Db.Insertable(new TableA() {id=2, Name = "A1" }).ExecuteCommand();
Db.Insertable(new TableB() { id=1, Name = "B1" }).ExecuteCommand();
Db.Insertable(new TableB() { id=2, Name = "B2" }).ExecuteCommand();
Db.Insertable(new ABMap() { Aid=1,Bid=1 }).ExecuteCommand();
Db.Insertable(new TableA() { id = 1, Name = "A1" }).ExecuteCommand();
Db.Insertable(new TableA() { id = 2, Name = "A1" }).ExecuteCommand();
Db.Insertable(new TableB() { id = 1, Name = "B1" }).ExecuteCommand();
Db.Insertable(new TableB() { id = 2, Name = "B2" }).ExecuteCommand();
Db.Insertable(new ABMap() { Aid = 1, Bid = 1 }).ExecuteCommand();
Db.Insertable(new ABMap() { Aid = 1, Bid = 2 }).ExecuteCommand();
Db.Insertable(new ABMap() { Aid = 2, Bid = 1 }).ExecuteCommand();
Db.Insertable(new ABMap() { Aid = 2, Bid =2 }).ExecuteCommand();
var list9= Db.Queryable<TableA>()
Db.Insertable(new ABMap() { Aid = 2, Bid = 2 }).ExecuteCommand();
var list9 = Db.Queryable<TableA>()
.Mapper<TableA, TableB, ABMap>(it => ManyToMany.Config(it.Aid, it.Bid)).ToList();
var _db = Db;
int[] communities = { 1, 2, 3, 4, 5 };
_db.QueryFilter.Add(new TableFilterItem<Dat_WorkBill>(it => communities.Contains(it.CommunityID ?? 0)));
Db.CodeFirst.InitTables<Dat_WorkBill, Base_Community>();
var rlt = _db.Queryable(_db.Queryable<Dat_WorkBill>(), _db.Queryable<Base_Community>(),
JoinType.Left, (bill, com) => bill.CommunityID == com.CommunityID)
.Where((bill, com) => com.IsEnable == 1)
.Select((bill, com) => new
{
ID = bill.WorkBillID,
Name = com.CommunityName
})
.ToList();
_db.QueryFilter.Clear();
}
public class Dat_WorkBill
{
public int? CommunityID { get; set; }
public string WorkBillID { get; set; }
}
public class Base_Community
{
public int? CommunityID { get; set; }
public int IsEnable { get; set; }
public string CommunityName { get; set; }
}
public class ABMap{
public class ABMap
{
public int Aid { get; set; }
public int Bid { get; set; }
}
public class TableA{
[SugarColumn(IsPrimaryKey =true,IsIdentity =true)]
public class TableA
{
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int id { get; set; }
public string Name { get; set; }
[SugarColumn(IsIgnore =true)]
[SugarColumn(IsIgnore = true)]
public List<TableB> Childlist { get; set; }
}

2
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@ -357,6 +357,8 @@ namespace SqlSugar
}
else if (isMain)
{
if (TableShortName == null)
return;
var shortName = this.Builder.GetTranslationColumnName(TableShortName) + ".";
sql = sql.Replace(itName, shortName);
}