This commit is contained in:
sunkaixuan
2017-01-14 18:00:20 +08:00
parent 3ad3e1a1d9
commit 3424e2e199
27 changed files with 38 additions and 28 deletions

Binary file not shown.

View File

@@ -16,7 +16,7 @@ namespace OrmTest.ExpressionTest
Expression<Func<Student, object>> exp = it => new Program() { x = it.Name };
ExpressionContext expContext = new ExpressionContext(exp, ResolveExpressType.WhereSingle);
expContext.ResolveType = ResolveExpressType.SelectSingle;
var x= expContext.ToResultString();
var x = expContext.Result;
}
}
}

View File

@@ -32,7 +32,7 @@ namespace OrmTest
// Expression<Func<Student, object>> exp = it => it.Name;
ExpressionContext expContext = new ExpressionContext(exp, ResolveExpressType.WhereSingle);
// var x = expContext.GetFiledName();
var xx = expContext.ToResultString();
// var xx = expContext.ToResultString();
var b = DateTime.Now;

Binary file not shown.

Binary file not shown.

View File

@@ -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>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -37,7 +37,11 @@ namespace SqlSugar
}
}
#endregion
public string GetString()
{
if (_Result == null) return null;
return _Result.ToString();
}
#region functions
public string[] GetResultArray()
{
@@ -75,6 +79,23 @@ namespace SqlSugar
public void AppendFormat(string parameter, params object[] orgs)
{
switch (this._ResolveExpressType)
{
case ResolveExpressType.WhereSingle:
break;
case ResolveExpressType.WhereMultiple:
break;
case ResolveExpressType.SelectSingle:
break;
case ResolveExpressType.SelectMultiple:
break;
case ResolveExpressType.FieldSingle:
break;
case ResolveExpressType.FieldMultiple:
break;
default:
break;
}
this.Result.AppendFormat(parameter, orgs);
}

View File

@@ -26,7 +26,6 @@ namespace SqlSugar
public int Index { get; set; }
public ResolveExpressType ResolveType { get; set; }
public Expression Expression { get; set; }
public object ResultObj { get; set; }
public ExpressionResult Result
{
get

View File

@@ -28,21 +28,18 @@ namespace SqlSugar
string leftString = GetLeftString(parameter);
string rightString = GetRightString(parameter);
string binarySql =string.Format(ExpressionConst.BinaryFormatString,leftString,operatorValue,rightString);
string sqlWhereString = base.Context.ResultString.ObjToString();
if (base.Context.ResultString == null) {
base.Context.ResultString = new StringBuilder();
}
string sqlWhereString = base.Context.Result.GetResultString();
if (sqlWhereString.Contains(ExpressionConst.Format0))
{
base.Context.ResultString.Replace(ExpressionConst.Format0, binarySql);
base.Context.Result.Replace(ExpressionConst.Format0, binarySql);
}
else
{
base.Context.ResultString.Append(binarySql);
base.Context.Result.Append(binarySql);
}
if (sqlWhereString.Contains(ExpressionConst.Format1))
{
base.Context.ResultString.Replace(ExpressionConst.Format1, ExpressionConst.Format0);
base.Context.Result.Replace(ExpressionConst.Format1, ExpressionConst.Format0);
}
}

View File

@@ -12,7 +12,6 @@ namespace SqlSugar
{
var expression = base.Expression as ConstantExpression;
var isLeft = parameter.IsLeft;
var isWhereSingle = parameter.Context.IsWhereSingle;
object value = expression.Value;
if (parameter.BaseParameter.BinaryExpressionInfoList != null)
{

View File

@@ -13,7 +13,6 @@ namespace SqlSugar
{
var expression = base.Expression as MemberExpression;
var isLeft = parameter.IsLeft;
var isWhereSingle = parameter.Context.IsWhereSingle;
object value = ExpressionTool.GetValue(expression.Member, expression);
if (parameter.BaseParameter.BinaryExpressionInfoList != null)
{

View File

@@ -11,7 +11,6 @@ namespace SqlSugar
{
var expression = base.Expression as MemberExpression;
var isLeft = parameter.IsLeft;
var isWhereSingle = parameter.Context.IsWhereSingle;
string fieldName = string.Empty;
switch (parameter.Context.ResolveType)
{
@@ -22,12 +21,10 @@ namespace SqlSugar
fieldName = GetFiledNameByWhereMultiple(parameter, expression, isLeft);
break;
case ResolveExpressType.SelectSingle:
base.Context.ResultString = new StringBuilder();
base.Context.ResultString.Append(fieldName);
base.Context.Result.Append(fieldName);
break;
case ResolveExpressType.SelectMultiple:
base.Context.ResultString = new StringBuilder();
base.Context.ResultString.Append(fieldName);
base.Context.Result.Append(fieldName);
break;
case ResolveExpressType.FieldSingle:
break;

View File

@@ -12,7 +12,6 @@ namespace SqlSugar
{
var expression = base.Expression as MemberExpression;
var isLeft = parameter.IsLeft;
var isWhereSingle = parameter.Context.IsWhereSingle;
object value = null;
value = ExpressionTool.DynamicInvoke(expression);
if (parameter.BaseParameter.BinaryExpressionInfoList != null)

View File

@@ -12,7 +12,6 @@ namespace SqlSugar
{
var expression = base.Expression as MemberExpression;
var isLeft = parameter.IsLeft;
var isWhereSingle = parameter.Context.IsWhereSingle;
object value = null;
var isField = expression.Member is System.Reflection.FieldInfo;
var isProperty = expression.Member is System.Reflection.PropertyInfo;
@@ -33,11 +32,6 @@ namespace SqlSugar
ExpressionType = ExpressionConst.ConstantExpressionType
}));
}
if (isLeft == null && base.Context.ResultString == null)
{
base.Context.ResultString = new StringBuilder();
base.Context.ResultString.Append(value);
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -3,4 +3,3 @@ F:\MyOpenSource\SqlSugar4.XNew\SqlSugar\SqlSugar\bin\Debug\SqlSugar.pdb
F:\MyOpenSource\SqlSugar4.XNew\SqlSugar\SqlSugar\bin\Debug\Newtonsoft.Json.dll
F:\MyOpenSource\SqlSugar4.XNew\SqlSugar\SqlSugar\obj\Debug\SqlSugar.dll
F:\MyOpenSource\SqlSugar4.XNew\SqlSugar\SqlSugar\obj\Debug\SqlSugar.pdb
F:\MyOpenSource\SqlSugar4.XNew\SqlSugar\SqlSugar\obj\Debug\SqlSugar.csprojResolveAssemblyReference.cache

Binary file not shown.

Binary file not shown.