From 40b3da5373d745251511def0088b44c1dfe39a5d Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Sun, 8 Jan 2017 21:46:57 +0800
Subject: [PATCH] -

---
 .vs/SqlSugar/v14/.suo                         | Bin 190976 -> 190464 bytes
 .../ExpressionsToSql/ExpressionContext.cs     |  60 +++++++++++-------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/.vs/SqlSugar/v14/.suo b/.vs/SqlSugar/v14/.suo
index 5e05f155bc316e3fde09f83486c0563f4b817ddd..4808b2c7c0654e6134254a0502fa1d3adbe06e3e 100644
GIT binary patch
delta 608
zcmYk&Pe>F|90&0Ey?K*6?pUs_SUKjj1Zf2BlA**RVI@Jd2T|%E9kxS<w%E#U1twxa
zduZnuOmwn2NY~~OfklU!TahIlMfT9S(;nO)>-%t(eemJE_kCa9{F(omod2GDmL*Zm
z^`%V1Fb=~pcm#`FeKGu|JV%izNvrmFyZV;zh$;ST=2Trc<R{!*3BB7;gnt;*n6JV?
zcn)2#9}d8A=;h0azS+NMp2qGJ9Dxov4=IqebJG~sx~E4P>l@%g9&~oIIqS6^<IO$C
z@+|eUWsN#I?%a(pT7z7+W!h;5YnZR^9zL;7_Um>Vf&mzXyD$TXz~Ud)aMT`~35neh
z@bZ+$S&>lnjy2P!Zba=ZvHx50R_c;%WDx3)-|Np^t5B3aM>gpP;$vHmdMeV7JobvO
z<^7fe>lSK}Y82Zjbe(9~6UsYLOZuy6>gHFK0X4GfkT`1a#QTrIdMwTa<pxPLKK9A<
zqm0VThQx7Kc3+5VwhjJs;hVhIa=ofgIuxvb5P6l4SE%<PYG3S~zpUTUFs>k}al;)_
rnTbsb#8XiUYFpI#?!hmyNa3W6Hog+O(y5jQLq{wWmI|~|5HJ4&)Jw;A

delta 1129
zcmYk*TS!xJ9Ki9NGo4%WlGmnNUY4nurBkXss6<LZP0}(W5<z;1Zm>e>-qr>4A;|6j
zkPkh?0=r-IbfHj)H1R1SdJ0@cR%T^4vodpi|FysaAAY~z|NlGx|NorrcpsU)Pt0va
ziq7Y-#w$9Vt{yvZ7{`RKy|B~Wq;#p<BTU|&Ay?Oy$I3p@tcH|JqFL`z$8};nD#wvV
zb2<_c;;JS7CR&Jlk$_mlAs4$vmC;(emTVD9AiJZ8sfb4;V&FtR<f=);&9I>qtFaAo
z&K{1UJEGMh2dWv!!Yw4D8KT}~u@sSH;5Ig)67mLdA~M@0lmAyE6HBlQ>%vWPZYtc+
zz?d0zIEe!|h(qu~n=}pRMPF5ES8T6d^lmKkCsb$^4V{YNF0+fvw289@HINdKd6ZH<
ze<bg}C7jDWj+3`SWY#6chc^wiG2p{F`P=y1d7kqW7jO|ba2Z!{71wYbo#=uFdHkD1
z2iD^b<l;Noy*r%u5buR^IoCHWm-PecehhLr(Z0avF7N~?pW!)P;3Z`15b+gW;|+%K
z79)6v_xONOe8eYw#ut3W7`{Os`#bRme&QG8`jf;d`CpNR!ZXO|x7szkEoc_rbi2sT
zu!-_CgI3w!tpxI;15edc#kFd=R_?s7_sH(3@Le+Bz;Xs^6O4$(444s(7{nnFGa<j3
z1Xz)TWTapgEJ#HfGGN1Oq+=`lWGcEET^5BMbC8X>$U!dhFc0~dj{+=&JSd;+-{>F~
zqXd=kH7<3oAj%$jt(=yxBCnoS|LX{aY8Z3F*SJRv3_5*oqd(YZEaZstqZMb?WQroy
zsEq}qmB6qnyf)tMvY_H0sSv$-ht@RWRSf&(1Eq?IvWMEha;H8psvdE*xRef;db(ps
GRsR4%0%BAE

diff --git a/SqlSugar/ExpressionsToSql/ExpressionContext.cs b/SqlSugar/ExpressionsToSql/ExpressionContext.cs
index 5d34cf765..2c1dd5fc0 100644
--- a/SqlSugar/ExpressionsToSql/ExpressionContext.cs
+++ b/SqlSugar/ExpressionsToSql/ExpressionContext.cs
@@ -9,36 +9,27 @@ namespace SqlSugar
 {
     public class ExpressionContext : ExpResolveAccessory
     {
-        public ResolveExpressType Type { get; set; }
-        public Expression Expression { get; set; }
-        public StringBuilder SqlWhere { get; set; }
-        public virtual string SqlParameterKeyWord
-        {
-            get
-            {
-                return "@";
-            }
-        }
-        public virtual string GetaMppingColumnsName(string name)
-        {
-            return name;
-        }
-        public bool IsSingle { get { return this.Type == ResolveExpressType.Single; } }
-
+        #region constructor
         public ExpressionContext(Expression expression, ResolveExpressType type)
         {
             this.Type = type;
             this.Expression = expression;
         }
 
-        public string ToSqlString()
-        {
-            BaseResolve resolve = new BaseResolve(new ExpressionParameter() { Expression = this.Expression, Context = this });
-            resolve.Start();
-            if (this.SqlWhere == null) return string.Empty;
-            return this.SqlWhere.ToString();
-        }
+        #endregion
 
+        #region properties
+        public int Index { get; set; }
+        public ResolveExpressType Type { get; set; }
+        public Expression Expression { get; set; }
+        public StringBuilder SqlWhere { get; set; }
+        public bool IsSingle
+        {
+            get
+            {
+                return this.Type == ResolveExpressType.Single;
+            }
+        }
         public List<SugarParameter> Parameters
         {
             get
@@ -50,7 +41,28 @@ namespace SqlSugar
                 base._Parameters = value;
             }
         }
+        public virtual string SqlParameterKeyWord
+        {
+            get
+            {
+                return "@";
+            }
+        }
+        #endregion
 
-        public int Index { get; set; }
+        #region functions
+        public virtual string GetaMppingColumnsName(string name)
+        {
+            return name;
+        }
+
+        public virtual string ToSqlString()
+        {
+            BaseResolve resolve = new BaseResolve(new ExpressionParameter() { Expression = this.Expression, Context = this });
+            resolve.Start();
+            if (this.SqlWhere == null) return string.Empty;
+            return this.SqlWhere.ToString();
+        } 
+        #endregion
     }
 }