Browse Source

-

pull/12/MERGE
sunkaixuan 8 years ago
parent
commit
315541bd3a
  1. BIN
      .vs/SqlSugar/v14/.suo
  2. BIN
      OrmTest/bin/Debug/Newtonsoft.Json.dll
  3. BIN
      OrmTest/bin/Debug/OrmTest.exe
  4. 6
      OrmTest/bin/Debug/OrmTest.exe.config
  5. BIN
      OrmTest/bin/Debug/OrmTest.pdb
  6. BIN
      OrmTest/bin/Debug/SqlSugar.dll
  7. BIN
      OrmTest/bin/Debug/SqlSugar.pdb
  8. BIN
      OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache
  9. BIN
      OrmTest/obj/Debug/OrmTest.exe
  10. BIN
      OrmTest/obj/Debug/OrmTest.pdb
  11. 11
      SqlSugar/ExpressionsToSql/ExpInfo.cs
  12. 3
      SqlSugar/ExpressionsToSql/ExpItems/BaseResolve.cs
  13. 2
      SqlSugar/ExpressionsToSql/ExpItems/BinaryExpressionResolve.cs
  14. 8
      SqlSugar/ExpressionsToSql/ExpItems/MemberExpressionResolve.cs
  15. 1
      SqlSugar/SqlSugar.csproj
  16. BIN
      SqlSugar/bin/Debug/SqlSugar.dll
  17. BIN
      SqlSugar/bin/Debug/SqlSugar.pdb
  18. BIN
      SqlSugar/obj/Debug/SqlSugar.dll
  19. BIN
      SqlSugar/obj/Debug/SqlSugar.pdb

BIN
.vs/SqlSugar/v14/.suo

Binary file not shown.

BIN
OrmTest/bin/Debug/Newtonsoft.Json.dll

Binary file not shown.

BIN
OrmTest/bin/Debug/OrmTest.exe

Binary file not shown.

6
OrmTest/bin/Debug/OrmTest.exe.config

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
</configuration>

BIN
OrmTest/bin/Debug/OrmTest.pdb

Binary file not shown.

BIN
OrmTest/bin/Debug/SqlSugar.dll

Binary file not shown.

BIN
OrmTest/bin/Debug/SqlSugar.pdb

Binary file not shown.

BIN
OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache

Binary file not shown.

BIN
OrmTest/obj/Debug/OrmTest.exe

Binary file not shown.

BIN
OrmTest/obj/Debug/OrmTest.pdb

Binary file not shown.

11
SqlSugar/ExpressionsToSql/ExpInfo.cs

@ -1,11 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace SqlSugar
{
public class ExpInfo
{
}
}

3
SqlSugar/ExpressionsToSql/ExpItems/BaseResolve.cs

@ -8,6 +8,7 @@ namespace SqlSugar
public class BaseResolve
{
protected Expression Expression { get; set; }
protected Expression BaseExpression { get; set; }
public ExpressionContext Context { get; set; }
public string SqlWhere { get; set; }
public bool IsFinished { get; set; }
@ -34,7 +35,7 @@ namespace SqlSugar
Context = this.Context,
Expression = exp,
IsLeft = this.IsLeft,
BaseExpression=this.Expression
BaseExpression=this.BaseExpression
};
if (exp is LambdaExpression)
{

2
SqlSugar/ExpressionsToSql/ExpItems/BinaryExpressionResolve.cs

@ -10,7 +10,7 @@ namespace SqlSugar
public BinaryExpressionResolve(ExpressionParameter parameter) : base(parameter)
{
var expression = this.Expression as BinaryExpression;
var baseExpression = parameter.Expression;
base.BaseExpression = expression;
base.IsLeft = true;
base.Expression = expression.Left;
base.Start();

8
SqlSugar/ExpressionsToSql/ExpItems/MemberExpressionResolve.cs

@ -10,13 +10,13 @@ namespace SqlSugar
public MemberExpressionResolve(ExpressionParameter parameter) : base(parameter)
{
var expression = base.Expression as MemberExpression;
var isLeft = this.IsLeft;
this.IsLeft = null;
var isSingle = base.Context.IsSingle;
var isLeft = parameter.IsLeft;
var isSingle = parameter.Context.IsSingle;
string field = string.Empty;
field = isSingle ? expression.Member.Name : expression.Member.ToString();
base.IsFinished = true;
if (IsLeft == true)
base.SqlWhere += string.Format(" {0} ", field);
if (isLeft == true)
{
base.SqlWhere += ExpTool.GetOperator(parameter.BaseExpression.NodeType);
}

1
SqlSugar/SqlSugar.csproj

@ -109,7 +109,6 @@
<Compile Include="Enum\OrderByType.cs" />
<Compile Include="ExpressionsToSql\ResolveExpressType.cs" />
<Compile Include="ExpressionsToSql\ExpConst.cs" />
<Compile Include="ExpressionsToSql\ExpInfo.cs" />
<Compile Include="ExpressionsToSql\ExpItems\BaseResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\BinaryExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\BlockExpressionResolve.cs" />

BIN
SqlSugar/bin/Debug/SqlSugar.dll

Binary file not shown.

BIN
SqlSugar/bin/Debug/SqlSugar.pdb

Binary file not shown.

BIN
SqlSugar/obj/Debug/SqlSugar.dll

Binary file not shown.

BIN
SqlSugar/obj/Debug/SqlSugar.pdb

Binary file not shown.
Loading…
Cancel
Save