lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2026-02-27 16:50:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update exp to sql

Browse Source
This commit is contained in:
sunkaixuan
2022-04-13 21:10:02 +08:00
parent 53e4891182
commit ca07200bbe
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs
View File

@@ -86,9 +86,11 @@ namespace OrmTest
db.Insertable(new ABMapping1() { AId=1,BId=1 }).ExecuteCommand(); db.Insertable(new ABMapping1() { AId=1,BId=1 }).ExecuteCommand();
db.Insertable(new ABMapping1() { AId =2, BId = 1 }).ExecuteCommand(); db.Insertable(new ABMapping1() { AId =2, BId = 1 }).ExecuteCommand();
db.Insertable(new ABMapping1() { AId = 2, BId = 2 }).ExecuteCommand(); db.Insertable(new ABMapping1() { AId = 2, BId = 2 }).ExecuteCommand();
var list3= db.Queryable<A1>() var list3= db.Queryable<A1>()
.Includes(x => x.BList) .Includes(x => x.BList.Where(it=>it.Id==1).ToList())
.Where(x=>x.BList.Any()).ToList(); .Where(x=>x.BList.Any()).ToList();
var list31 = db.Queryable<A1>().Includes(x => x.BList,x=>x.AList).ToList(); var list31 = db.Queryable<A1>().Includes(x => x.BList,x=>x.AList).ToList();
db.CodeFirst.InitTables(typeof(Tree1)); db.CodeFirst.InitTables(typeof(Tree1));

15
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@@ -179,7 +179,7 @@ namespace SqlSugar
CSharpTypeName = bColumn.PropertyInfo.PropertyType.Name CSharpTypeName = bColumn.PropertyInfo.PropertyType.Name
})); }));
var sql = GetWhereSql(); var sql = GetWhereSql();
var bList = selector(this.Context.Queryable<object>().AS(bEntityInfo.DbTableName).Where(conditionalModels2).WhereIF(sql.WhereString.HasValue(),sql.WhereString).OrderByIF(sql.OrderByString.HasValue(),sql.OrderByString)); var bList = selector(this.Context.Queryable<object>().AS(bEntityInfo.DbTableName).AddParameters(sql.Parameters).Where(conditionalModels2).WhereIF(sql.WhereString.HasValue(),sql.WhereString).OrderByIF(sql.OrderByString.HasValue(),sql.OrderByString));
if (bList.HasValue()) if (bList.HasValue())
{ {
foreach (var listItem in list) foreach (var listItem in list)
@@ -243,7 +243,7 @@ namespace SqlSugar
CSharpTypeName = listItemPkColumn.PropertyInfo.PropertyType.Name CSharpTypeName = listItemPkColumn.PropertyInfo.PropertyType.Name
})); }));
var sqlObj = GetWhereSql(); var sqlObj = GetWhereSql();
var navList = selector(this.Context.Queryable<object>().AS(navEntityInfo.DbTableName).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(),sqlObj.WhereString).OrderByIF(sqlObj.OrderByString.HasValue(),sqlObj.OrderByString)); var navList = selector(this.Context.Queryable<object>().AS(navEntityInfo.DbTableName).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(),sqlObj.WhereString).OrderByIF(sqlObj.OrderByString.HasValue(),sqlObj.OrderByString));
if (navList.HasValue()) if (navList.HasValue())
{ {
foreach (var item in list) foreach (var item in list)
@@ -268,23 +268,25 @@ namespace SqlSugar
List<string> oredrBy = new List<string>(); List<string> oredrBy = new List<string>();
_ListCallFunc.Reverse(); _ListCallFunc.Reverse();
SqlInfo result = new SqlInfo(); SqlInfo result = new SqlInfo();
result.Parameters = new List<SugarParameter>();
foreach (var item in _ListCallFunc) foreach (var item in _ListCallFunc)
{ {
var method = item as MethodCallExpression; var method = item as MethodCallExpression;
var queryable = this.Context.Queryable<object>();
if (method.Method.Name == "Where") if (method.Method.Name == "Where")
{ {
var exp = method.Arguments[1]; var exp = method.Arguments[1];
where.Add("Where " + this.Context.Queryable<object>().QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); where.Add(" " +queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
} }
else if (method.Method.Name == "OrderBy") else if (method.Method.Name == "OrderBy")
{ {
var exp = method.Arguments[1]; var exp = method.Arguments[1];
oredrBy.Add( " "+this.Context.Queryable<object>().QueryBuilder.GetExpressionValue(exp,ResolveExpressType.WhereSingle).GetString()); oredrBy.Add( " "+ queryable.QueryBuilder.GetExpressionValue(exp,ResolveExpressType.WhereSingle).GetString());
} }
else if (method.Method.Name == "OrderByDescending") else if (method.Method.Name == "OrderByDescending")
{ {
var exp = method.Arguments[1]; var exp = method.Arguments[1];
oredrBy.Add(" " + this.Context.Queryable<object>().QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()+" DESC"); oredrBy.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()+" DESC");
} }
else if (method.Method.Name == "ToList") else if (method.Method.Name == "ToList")
{ {
@@ -293,6 +295,8 @@ namespace SqlSugar
{ {
Check.ExceptionEasy($"no support {item}", $"不支持表达式{item} 不支持方法{method.Method.Name}"); Check.ExceptionEasy($"no support {item}", $"不支持表达式{item} 不支持方法{method.Method.Name}");
} }
if(queryable.QueryBuilder.Parameters!=null)
result.Parameters.AddRange(queryable.QueryBuilder.Parameters);
} }
if (where.Any()) if (where.Any())
{ {
@@ -309,6 +313,7 @@ namespace SqlSugar
{ {
public string WhereString { get; set; } public string WhereString { get; set; }
public string OrderByString { get; set; } public string OrderByString { get; set; }
public List<SugarParameter> Parameters { get; set; }
} }
} }