diff --git a/.vs/SqlSugar/v14/.suo b/.vs/SqlSugar/v14/.suo index 98661c0d8..cf13b65fa 100644 Binary files a/.vs/SqlSugar/v14/.suo and b/.vs/SqlSugar/v14/.suo differ diff --git a/OrmTest/bin/Debug/OrmTest.exe b/OrmTest/bin/Debug/OrmTest.exe index 54816f68f..4dbf033e7 100644 Binary files a/OrmTest/bin/Debug/OrmTest.exe and b/OrmTest/bin/Debug/OrmTest.exe differ diff --git a/OrmTest/bin/Debug/OrmTest.pdb b/OrmTest/bin/Debug/OrmTest.pdb index 8879f5427..26af7a12f 100644 Binary files a/OrmTest/bin/Debug/OrmTest.pdb and b/OrmTest/bin/Debug/OrmTest.pdb differ diff --git a/OrmTest/bin/Debug/SqlSugar.dll b/OrmTest/bin/Debug/SqlSugar.dll index 2d3d42d60..94a696046 100644 Binary files a/OrmTest/bin/Debug/SqlSugar.dll and b/OrmTest/bin/Debug/SqlSugar.dll differ diff --git a/OrmTest/bin/Debug/SqlSugar.pdb b/OrmTest/bin/Debug/SqlSugar.pdb index 01b9cce25..b7d83bc74 100644 Binary files a/OrmTest/bin/Debug/SqlSugar.pdb and b/OrmTest/bin/Debug/SqlSugar.pdb differ diff --git a/OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache b/OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache index c3676c037..9249dd163 100644 Binary files a/OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache and b/OrmTest/obj/Debug/OrmTest.csprojResolveAssemblyReference.cache differ diff --git a/OrmTest/obj/Debug/OrmTest.exe b/OrmTest/obj/Debug/OrmTest.exe index 54816f68f..4dbf033e7 100644 Binary files a/OrmTest/obj/Debug/OrmTest.exe and b/OrmTest/obj/Debug/OrmTest.exe differ diff --git a/OrmTest/obj/Debug/OrmTest.pdb b/OrmTest/obj/Debug/OrmTest.pdb index 8879f5427..26af7a12f 100644 Binary files a/OrmTest/obj/Debug/OrmTest.pdb and b/OrmTest/obj/Debug/OrmTest.pdb differ diff --git a/SqlSugar/ExpressionsToSql/ExpressionParameter.cs b/SqlSugar/ExpressionsToSql/ExpressionParameter.cs index adf499df6..f376b9a80 100644 --- a/SqlSugar/ExpressionsToSql/ExpressionParameter.cs +++ b/SqlSugar/ExpressionsToSql/ExpressionParameter.cs @@ -12,5 +12,7 @@ namespace SqlSugar public ExpressionContext Context { get; set; } public bool? IsLeft { get; set; } public Expression BaseExpression { get; set; } + public int Index { get; set; } + public Dictionary TempData { get; set; } } } diff --git a/SqlSugar/ExpressionsToSql/ExpItems/BaseResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs similarity index 94% rename from SqlSugar/ExpressionsToSql/ExpItems/BaseResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs index 0c28b230e..d5ad3ef26 100644 --- a/SqlSugar/ExpressionsToSql/ExpItems/BaseResolve.cs +++ b/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs @@ -15,6 +15,8 @@ namespace SqlSugar public bool? IsLeft { get; set; } public int ContentIndex { get { return this.Context.Index; } } public int Index { get; set; } + public ExpressionParameter BaseParameter { get; set; } + private BaseResolve() { @@ -35,7 +37,8 @@ namespace SqlSugar Context = this.Context, Expression = exp, IsLeft = this.IsLeft, - BaseExpression=this.BaseExpression + BaseExpression = this.BaseExpression, + Index = this.Index }; if (exp is LambdaExpression) { diff --git a/SqlSugar/ExpressionsToSql/ExpItems/BinaryExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs similarity index 94% rename from SqlSugar/ExpressionsToSql/ExpItems/BinaryExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs index 35909488b..ea07dbd97 100644 --- a/SqlSugar/ExpressionsToSql/ExpItems/BinaryExpressionResolve.cs +++ b/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs @@ -11,6 +11,7 @@ namespace SqlSugar { var expression = this.Expression as BinaryExpression; base.BaseExpression = expression; + base.BaseParameter = parameter; base.IsLeft = true; base.Expression = expression.Left; base.Start(); diff --git a/SqlSugar/ExpressionsToSql/ExpItems/BlockExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/BlockExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/BlockExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/BlockExpressionResolve.cs diff --git a/SqlSugar/ExpressionsToSql/ExpItems/ConditionalExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/ConditionalExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/ConditionalExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/ConditionalExpressionResolve.cs diff --git a/SqlSugar/ExpressionsToSql/ExpItems/ConstantExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/ConstantExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs diff --git a/SqlSugar/ExpressionsToSql/ExpItems/LambdaExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/LambdaExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/LambdaExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/LambdaExpressionResolve.cs diff --git a/SqlSugar/ExpressionsToSql/ExpItems/MemberExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/MemberExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs diff --git a/SqlSugar/ExpressionsToSql/ExpItems/MethodCallExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/MethodCallExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs diff --git a/SqlSugar/ExpressionsToSql/ExpItems/UnaryExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/UnaryExpressionResolve.cs similarity index 100% rename from SqlSugar/ExpressionsToSql/ExpItems/UnaryExpressionResolve.cs rename to SqlSugar/ExpressionsToSql/ResolveItems/UnaryExpressionResolve.cs diff --git a/SqlSugar/SqlSugar.csproj b/SqlSugar/SqlSugar.csproj index c2b756f9c..8844daf59 100644 --- a/SqlSugar/SqlSugar.csproj +++ b/SqlSugar/SqlSugar.csproj @@ -109,15 +109,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/SqlSugar/bin/Debug/SqlSugar.dll b/SqlSugar/bin/Debug/SqlSugar.dll index 2d3d42d60..94a696046 100644 Binary files a/SqlSugar/bin/Debug/SqlSugar.dll and b/SqlSugar/bin/Debug/SqlSugar.dll differ diff --git a/SqlSugar/bin/Debug/SqlSugar.pdb b/SqlSugar/bin/Debug/SqlSugar.pdb index 01b9cce25..b7d83bc74 100644 Binary files a/SqlSugar/bin/Debug/SqlSugar.pdb and b/SqlSugar/bin/Debug/SqlSugar.pdb differ diff --git a/SqlSugar/obj/Debug/SqlSugar.dll b/SqlSugar/obj/Debug/SqlSugar.dll index 2d3d42d60..94a696046 100644 Binary files a/SqlSugar/obj/Debug/SqlSugar.dll and b/SqlSugar/obj/Debug/SqlSugar.dll differ diff --git a/SqlSugar/obj/Debug/SqlSugar.pdb b/SqlSugar/obj/Debug/SqlSugar.pdb index 01b9cce25..b7d83bc74 100644 Binary files a/SqlSugar/obj/Debug/SqlSugar.pdb and b/SqlSugar/obj/Debug/SqlSugar.pdb differ