mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-21 02:58:05 +08:00
Update unit test
This commit is contained in:
@@ -13,8 +13,11 @@ namespace OrmTest
|
|||||||
var db = NewUnitTest.Db;
|
var db = NewUnitTest.Db;
|
||||||
db.CodeFirst.InitTables<OperatorInfo, Role, OptRole>();
|
db.CodeFirst.InitTables<OperatorInfo, Role, OptRole>();
|
||||||
db.Queryable<OperatorInfo>()
|
db.Queryable<OperatorInfo>()
|
||||||
.Includes(x => x.Roles).Where(x => x.Roles.Any())
|
.Includes(x => x.Roles).Where(x => x.Roles.Any(z=>z.id==1))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
db.Queryable<OperatorInfo>()
|
||||||
|
.Includes(x => x.Roles).Where(x => x.Roles.Any())
|
||||||
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@@ -109,9 +109,12 @@ namespace SqlSugar
|
|||||||
mappingA = queryable.QueryBuilder.Builder.GetTranslationColumnName(mappingA);
|
mappingA = queryable.QueryBuilder.Builder.GetTranslationColumnName(mappingA);
|
||||||
mappingB = queryable.QueryBuilder.Builder.GetTranslationColumnName(mappingB);
|
mappingB = queryable.QueryBuilder.Builder.GetTranslationColumnName(mappingB);
|
||||||
var bTableName = queryable.QueryBuilder.Builder.GetTranslationTableName(this.ProPertyEntity.DbTableName);
|
var bTableName = queryable.QueryBuilder.Builder.GetTranslationTableName(this.ProPertyEntity.DbTableName);
|
||||||
mapper.Sql = $" (select count(1) from {bTableName} {this.ProPertyEntity.DbTableName}_1 where {this.ProPertyEntity.DbTableName}_1.{bPk} in (select {mappingB} from {mappingTableName} where {mappingA} = {ShorName}.{aPk} )) ";
|
mapper.Sql = $" (select count(1) from {bTableName} {this.ProPertyEntity.DbTableName}_1 where {this.ProPertyEntity.DbTableName}_1.{bPk} in (select {mappingB} from {mappingTableName} where {mappingA} = {ShorName}.{aPk} ) )";
|
||||||
if (this.whereSql.HasValue())
|
if (this.whereSql.HasValue())
|
||||||
mapper.Sql = mapper.Sql + " AND " + this.whereSql;
|
{
|
||||||
|
mapper.Sql = mapper.Sql.TrimEnd(')');
|
||||||
|
mapper.Sql = mapper.Sql + " AND " + this.whereSql+")";
|
||||||
|
}
|
||||||
mapper.Sql = $" ({mapper.Sql}) ";
|
mapper.Sql = $" ({mapper.Sql}) ";
|
||||||
mapper.Sql = GetMethodSql(mapper.Sql);
|
mapper.Sql = GetMethodSql(mapper.Sql);
|
||||||
return mapper;
|
return mapper;
|
||||||
|
Reference in New Issue
Block a user