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

update exp to sql

Browse Source
This commit is contained in:
sunkaixuna
2021-12-24 22:06:23 +08:00
parent 968463589b
commit 63bea7b182
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs
View File

@@ -258,9 +258,9 @@ namespace OrmTest
var list2 = db.Queryable<Order>().Where(it =>
SqlFunc.Subqueryable<OrderItem>()
.LeftJoin<OrderItem>((i,y)=>i.ItemId==y.ItemId)
.LeftJoin<OrderItem>((i,y)=>i.ItemId==y.ItemId&&2==2)
.InnerJoin<OrderItem>((i,y,z) => i.ItemId == z.ItemId)
.Where((i ,y)=>i.ItemId==1)
.Where((i ,y,z)=>i.ItemId==z.ItemId)
.Any()
).ToList();
;

4
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubInnerJoin.cs
View File

@@ -50,11 +50,11 @@ namespace SqlSugar
var joinString =string.Format(" {2} INNER JOIN {1} {0} ",
this.Context.GetTranslationColumnName(parameter.Name),
tableName,
this.Context.JoinIndex==1?name:"");
null);
var result = joinString+ "ON " + SubTools.GetMethodValue(Context, argExp, ResolveExpressType.WhereMultiple);
//var selfParameterName = Context.GetTranslationColumnName((argExp as LambdaExpression).Parameters.First().Name) + UtilConstants.Dot;
this.Context.JoinIndex++;
new SubSelect() { Context=this.Context}.SetShortName(exp, "+");
//result = result.Replace(selfParameterName, SubTools.GetSubReplace(this.Context));
return result;
}

4
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubLeftJoin.cs
View File

@@ -50,11 +50,11 @@ namespace SqlSugar
var joinString =string.Format(" {2} LEFT JOIN {1} {0} ",
this.Context.GetTranslationColumnName(parameter.Name),
tableName,
this.Context.JoinIndex==1?name:"");
null);
var result = joinString+ "ON " + SubTools.GetMethodValue(Context, argExp, ResolveExpressType.WhereMultiple);
//var selfParameterName = Context.GetTranslationColumnName((argExp as LambdaExpression).Parameters.First().Name) + UtilConstants.Dot;
this.Context.JoinIndex++;
new SubSelect() { Context = this.Context }.SetShortName(exp, "+");
//result = result.Replace(selfParameterName, SubTools.GetSubReplace(this.Context));
return result;
}

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelect.cs
View File

@@ -60,7 +60,7 @@ namespace SqlSugar
return result;
}
private void SetShortName(MethodCallExpression exp, string result)
public void SetShortName(MethodCallExpression exp, string result)
{
if (exp.Arguments[0] is LambdaExpression && result.IsContainsIn("+", "-"))
{

23
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs
View File

@@ -96,14 +96,33 @@ namespace SqlSugar
{
GetSubAs(sqlItems, asItems);
}
if (this.context.CurrentShortName.HasValue())
if (this.context.CurrentShortName.HasValue())
{
GetShortName(sqlItems);
}
var sql = string.Join(UtilConstants.Space, sqlItems);
var sql = "";
if (sqlItems.Count(it => IsJoin(it)) > 1)
{
var index = sqlItems.IndexOf(sqlItems.First(x=>IsJoin(x)));
var joinitems = sqlItems.Where(it => IsJoin(it)).ToList();
joinitems.Reverse();
var items = sqlItems.Where(it => !IsJoin(it)).ToList();
items.InsertRange(index, joinitems);
sql = string.Join(UtilConstants.Space, items);
}
else
{
sql = string.Join(UtilConstants.Space, sqlItems);
}
return this.context.DbMehtods.Pack(sql);
}
private static bool IsJoin(string it)
{
return it.StartsWith(" INNER JOIN") || it.StartsWith(" LEFT JOIN");
}
private void GetSubAs(List<string> sqlItems, List<string> asItems)
{
for (int i = 0; i < sqlItems.Count; i++)