Browse Source

Update exp to sql

pull/12/head
sunkaixuna 3 years ago
parent
commit
cc086cf2b3
  1. 1
      Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
  2. 1
      Src/Asp.Net/SqlServerTest/UnitTest/Main.cs
  3. 71
      Src/Asp.Net/SqlServerTest/UnitTest/UCustom01.cs
  4. 1
      Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
  5. 24
      Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelect.cs
  6. 14
      Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs

1
Src/Asp.Net/SqlServerTest/SqlServerTest.csproj

@ -94,6 +94,7 @@
<Compile Include="Models\OrderItem.cs" />
<Compile Include="Demo\Demo0_SqlSugarClient.cs" />
<Compile Include="Models\ViewOrder.cs" />
<Compile Include="UnitTest\UCustom01.cs" />
<Compile Include="UnitTest\UDelete.cs" />
<Compile Include="UnitTest\UFastest.cs" />
<Compile Include="UnitTest\UConfig.cs" />

1
Src/Asp.Net/SqlServerTest/UnitTest/Main.cs

@ -31,6 +31,7 @@ namespace OrmTest
}
public static void Init()
{
UCustom01.Init();
UConfig();
DeleteTest();
Fastest2();

71
Src/Asp.Net/SqlServerTest/UnitTest/UCustom01.cs

@ -0,0 +1,71 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OrmTest
{
public class UCustom01
{
public static void Init()
{
var db = new SqlSugarScope(new SqlSugar.ConnectionConfig()
{
ConnectionString = Config.ConnectionString,
DbType = DbType.SqlServer,
IsAutoCloseConnection = true
});
db.Aop.OnLogExecuted = (s, p) =>
{
Console.WriteLine(s);
};
//建表
if (!db.DbMaintenance.IsAnyTable("User_Test001", false))
{
db.CodeFirst.InitTables<User_Test001>();
}
if (!db.DbMaintenance.IsAnyTable("UserRole_Test001", false))
{
db.CodeFirst.InitTables<UserRole_Test001>();
}
//用例代码
var result = db.Queryable<User_Test001, UserRole_Test001>((u, ur) => new object[] {
JoinType.Left,u.ID==ur.UserID
}).Select((u, ur) => new
{
customName = SqlFunc.Subqueryable<User_Test001>().Where(s => s.UserName == u.UserName).Select(s => s.UserName+"")
}).ToPageList(1, 10);
Console.WriteLine(result);
Console.WriteLine("用例跑完");
Console.ReadKey();
}
[SugarTable("unitUser_Test001")]
public class User_Test001
{
public int ID { get; set; }
public string UserName { get; set; }
}
[SugarTable("unitUserRole_Test001")]
public class UserRole_Test001
{
public int ID { get; set; }
public int UserID { get; set; }
}
}
}

1
Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs

@ -39,6 +39,7 @@ namespace SqlSugar
public int Index { get; set; }
public int ParameterIndex { get; set; }
public string SingleTableNameSubqueryShortName{ get; set; }
public string CurrentShortName { get; set; }
public MappingColumnList MappingColumns { get; set; }
public MappingTableList MappingTables { get; set; }
public IgnoreColumnList IgnoreComumnList { get; set; }

24
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelect.cs

@ -49,10 +49,28 @@ namespace SqlSugar
this.Context.InitMappingInfo(entityType);
this.Context.RefreshMapping();
}
if(this.Context.JoinIndex==0)
return SubTools.GetMethodValue(this.Context, exp.Arguments[0],ResolveExpressType.FieldSingle);
var result = "";
if (this.Context.JoinIndex == 0)
result = SubTools.GetMethodValue(this.Context, exp.Arguments[0], ResolveExpressType.FieldSingle);
else
return SubTools.GetMethodValue(this.Context, exp.Arguments[0], ResolveExpressType.FieldMultiple);
result = SubTools.GetMethodValue(this.Context, exp.Arguments[0], ResolveExpressType.FieldMultiple);
SetShortName(exp, result);
return result;
}
private void SetShortName(MethodCallExpression exp, string result)
{
if (exp.Arguments[0] is LambdaExpression && result.IsContainsIn("+", "-"))
{
var parameters = (exp.Arguments[0] as LambdaExpression).Parameters;
if (parameters != null && parameters.Count > 0)
{
this.Context.CurrentShortName = this.Context.SqlTranslationLeft + parameters[0] + this.Context.SqlTranslationRight;
}
}
}
}
}

14
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubResolve.cs

@ -96,6 +96,10 @@ namespace SqlSugar
{
GetSubAs(sqlItems, asItems);
}
if (this.context.CurrentShortName.HasValue())
{
GetShortName(sqlItems);
}
var sql = string.Join(UtilConstants.Space, sqlItems);
return this.context.DbMehtods.Pack(sql);
}
@ -112,6 +116,16 @@ namespace SqlSugar
}
}
}
private void GetShortName(List<string> sqlItems)
{
for (int i = 0; i < sqlItems.Count; i++)
{
if (sqlItems[i].StartsWith("FROM " + this.context.SqlTranslationLeft))
{
sqlItems[i] = sqlItems[i]+" "+this.context.CurrentShortName +" ";
}
}
}
private List<string> GetSubItems()
{

Loading…
Cancel
Save