diff --git a/.vs/SqlSugar/v14/.suo b/.vs/SqlSugar/v14/.suo index 0bbfa2864..65aa6127a 100644 Binary files a/.vs/SqlSugar/v14/.suo and b/.vs/SqlSugar/v14/.suo differ diff --git a/OrmTest/ExpressionTest/Select.cs b/OrmTest/ExpressionTest/Select.cs new file mode 100644 index 000000000..6457a8879 --- /dev/null +++ b/OrmTest/ExpressionTest/Select.cs @@ -0,0 +1,22 @@ +using OrmTest.Models; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest.ExpressionTest +{ + public class Select + { + internal static void Init() + { + Expression> exp = it => new Program() { x = it.Name }; + ExpressionContext expContext = new ExpressionContext(exp, ResolveExpressType.WhereSingle); + expContext.ResolveType = ResolveExpressType.SelectSingle; + var x= expContext.ToResultString(); + } + } +} diff --git a/OrmTest/OrmTest.csproj b/OrmTest/OrmTest.csproj index 2a4b6c44a..5d78e4a75 100644 --- a/OrmTest/OrmTest.csproj +++ b/OrmTest/OrmTest.csproj @@ -43,6 +43,7 @@ + diff --git a/OrmTest/Program.cs b/OrmTest/Program.cs index 4e1eef834..cadd56e2f 100644 --- a/OrmTest/Program.cs +++ b/OrmTest/Program.cs @@ -21,6 +21,11 @@ namespace OrmTest public static string id { get; set;} static void Main(string[] args) { + + + OrmTest.ExpressionTest.Select.Init(); + + Program.id = "xx"; string x = "1"; Expression> exp = it => new Program() { x=it.Name }; diff --git a/OrmTest/bin/Debug/OrmTest.exe b/OrmTest/bin/Debug/OrmTest.exe index 3c01f02e0..dc268da73 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 69407189e..e41d45509 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 c91e1f0e1..22c45626c 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 906fd9915..3f8814e26 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 c97975cc5..09bc733ad 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 3c01f02e0..dc268da73 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 69407189e..e41d45509 100644 Binary files a/OrmTest/obj/Debug/OrmTest.pdb and b/OrmTest/obj/Debug/OrmTest.pdb differ diff --git a/SqlSugar/ExpressionsToSql/ExpressionContext.cs b/SqlSugar/ExpressionsToSql/ExpressionContext.cs index 4fdc847f1..d9f5598b5 100644 --- a/SqlSugar/ExpressionsToSql/ExpressionContext.cs +++ b/SqlSugar/ExpressionsToSql/ExpressionContext.cs @@ -13,9 +13,9 @@ namespace SqlSugar private ExpressionContext() { } - public ExpressionContext(Expression expression, ResolveExpressType type) + public ExpressionContext(Expression expression, ResolveExpressType resolveType) { - this.Type = type; + this.ResolveType = resolveType; this.Expression = expression; } #endregion @@ -23,7 +23,7 @@ namespace SqlSugar #region properties public IDbMethods DbMehtods { get; set; } public int Index { get; set; } - public ResolveExpressType Type { get; set; } + public ResolveExpressType ResolveType { get; set; } public Expression Expression { get; set; } public StringBuilder ResultString { get; set; } public object ResultObj { get; set; } @@ -31,7 +31,7 @@ namespace SqlSugar { get { - return this.Type == ResolveExpressType.WhereSingle; + return this.ResolveType == ResolveExpressType.WhereSingle; } } public List Parameters diff --git a/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs index 2ddedad54..21338de23 100644 --- a/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs +++ b/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs @@ -13,7 +13,7 @@ namespace SqlSugar var isLeft = parameter.IsLeft; var isWhereSingle = parameter.Context.IsWhereSingle; string fieldName = string.Empty; - switch (parameter.Context.Type) + switch (parameter.Context.ResolveType) { case ResolveExpressType.WhereSingle: fieldName = GetFieldNameByWhereSingle(parameter, expression, isLeft); diff --git a/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs b/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs index 48941db0e..62c66414e 100644 --- a/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs +++ b/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs @@ -11,7 +11,7 @@ namespace SqlSugar public MemberInitExpressionResolve(ExpressionParameter parameter) : base(parameter) { var expression = base.Expression as MemberInitExpression; - switch (parameter.Context.Type) + switch (parameter.Context.ResolveType) { case ResolveExpressType.WhereSingle: break; diff --git a/SqlSugar/bin/Debug/SqlSugar.dll b/SqlSugar/bin/Debug/SqlSugar.dll index c91e1f0e1..22c45626c 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 906fd9915..3f8814e26 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 c91e1f0e1..22c45626c 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 906fd9915..3f8814e26 100644 Binary files a/SqlSugar/obj/Debug/SqlSugar.pdb and b/SqlSugar/obj/Debug/SqlSugar.pdb differ