Browse Source

-

pull/12/MERGE
sunkaixuan 8 years ago
parent
commit
7697144d6d
  1. BIN
      .vs/SqlSugar/v14/.suo
  2. BIN
      OrmTest/bin/Debug/OrmTest.exe
  3. BIN
      OrmTest/bin/Debug/OrmTest.pdb
  4. BIN
      OrmTest/bin/Debug/SqlSugar.dll
  5. BIN
      OrmTest/bin/Debug/SqlSugar.pdb
  6. BIN
      OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache
  7. BIN
      OrmTest/obj/Debug/OrmTest.exe
  8. BIN
      OrmTest/obj/Debug/OrmTest.pdb
  9. 2
      SqlSugar/ExpressionsToSql/ExpressionParameter.cs
  10. 5
      SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs
  11. 1
      SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
  12. 0
      SqlSugar/ExpressionsToSql/ResolveItems/BlockExpressionResolve.cs
  13. 0
      SqlSugar/ExpressionsToSql/ResolveItems/ConditionalExpressionResolve.cs
  14. 0
      SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs
  15. 0
      SqlSugar/ExpressionsToSql/ResolveItems/LambdaExpressionResolve.cs
  16. 0
      SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs
  17. 0
      SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs
  18. 0
      SqlSugar/ExpressionsToSql/ResolveItems/UnaryExpressionResolve.cs
  19. 18
      SqlSugar/SqlSugar.csproj
  20. BIN
      SqlSugar/bin/Debug/SqlSugar.dll
  21. BIN
      SqlSugar/bin/Debug/SqlSugar.pdb
  22. BIN
      SqlSugar/obj/Debug/SqlSugar.dll
  23. BIN
      SqlSugar/obj/Debug/SqlSugar.pdb

BIN
.vs/SqlSugar/v14/.suo

Binary file not shown.

BIN
OrmTest/bin/Debug/OrmTest.exe

Binary file not shown.

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.

2
SqlSugar/ExpressionsToSql/ExpressionParameter.cs

@ -12,5 +12,7 @@ namespace SqlSugar
public ExpressionContext Context { get; set; } public ExpressionContext Context { get; set; }
public bool? IsLeft { get; set; } public bool? IsLeft { get; set; }
public Expression BaseExpression { get; set; } public Expression BaseExpression { get; set; }
public int Index { get; set; }
public Dictionary<string, string> TempData { get; set; }
} }
} }

5
SqlSugar/ExpressionsToSql/ExpItems/BaseResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs

@ -15,6 +15,8 @@ namespace SqlSugar
public bool? IsLeft { get; set; } public bool? IsLeft { get; set; }
public int ContentIndex { get { return this.Context.Index; } } public int ContentIndex { get { return this.Context.Index; } }
public int Index { get; set; } public int Index { get; set; }
public ExpressionParameter BaseParameter { get; set; }
private BaseResolve() private BaseResolve()
{ {
@ -35,7 +37,8 @@ namespace SqlSugar
Context = this.Context, Context = this.Context,
Expression = exp, Expression = exp,
IsLeft = this.IsLeft, IsLeft = this.IsLeft,
BaseExpression=this.BaseExpression BaseExpression = this.BaseExpression,
Index = this.Index
}; };
if (exp is LambdaExpression) if (exp is LambdaExpression)
{ {

1
SqlSugar/ExpressionsToSql/ExpItems/BinaryExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs

@ -11,6 +11,7 @@ namespace SqlSugar
{ {
var expression = this.Expression as BinaryExpression; var expression = this.Expression as BinaryExpression;
base.BaseExpression = expression; base.BaseExpression = expression;
base.BaseParameter = parameter;
base.IsLeft = true; base.IsLeft = true;
base.Expression = expression.Left; base.Expression = expression.Left;
base.Start(); base.Start();

0
SqlSugar/ExpressionsToSql/ExpItems/BlockExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/BlockExpressionResolve.cs

0
SqlSugar/ExpressionsToSql/ExpItems/ConditionalExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/ConditionalExpressionResolve.cs

0
SqlSugar/ExpressionsToSql/ExpItems/ConstantExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs

0
SqlSugar/ExpressionsToSql/ExpItems/LambdaExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/LambdaExpressionResolve.cs

0
SqlSugar/ExpressionsToSql/ExpItems/MemberExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs

0
SqlSugar/ExpressionsToSql/ExpItems/MethodCallExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs

0
SqlSugar/ExpressionsToSql/ExpItems/UnaryExpressionResolve.cs → SqlSugar/ExpressionsToSql/ResolveItems/UnaryExpressionResolve.cs

18
SqlSugar/SqlSugar.csproj

@ -109,15 +109,15 @@
<Compile Include="Enum\OrderByType.cs" /> <Compile Include="Enum\OrderByType.cs" />
<Compile Include="ExpressionsToSql\ResolveExpressType.cs" /> <Compile Include="ExpressionsToSql\ResolveExpressType.cs" />
<Compile Include="ExpressionsToSql\ExpConst.cs" /> <Compile Include="ExpressionsToSql\ExpConst.cs" />
<Compile Include="ExpressionsToSql\ExpItems\BaseResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\BaseResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\BinaryExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\BinaryExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\BlockExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\BlockExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\ConditionalExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\ConditionalExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\ConstantExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\ConstantExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\LambdaExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\LambdaExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\MemberExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\MemberExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\MethodCallExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\MethodCallExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpItems\UnaryExpressionResolve.cs" /> <Compile Include="ExpressionsToSql\ResolveItems\UnaryExpressionResolve.cs" />
<Compile Include="ExpressionsToSql\ExpResolveAccessory.cs" /> <Compile Include="ExpressionsToSql\ExpResolveAccessory.cs" />
<Compile Include="ExpressionsToSql\ExpressionContext.cs" /> <Compile Include="ExpressionsToSql\ExpressionContext.cs" />
<Compile Include="ExpressionsToSql\ExpTool.cs" /> <Compile Include="ExpressionsToSql\ExpTool.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