lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 02:14:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

4.2.0.8

Browse Source
This commit is contained in:
sunkaixuan
2017-07-17 01:00:59 +08:00
parent 38d472c545
commit da4b8e8305
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlServerTest/UnitTest/EnumTest.cs
View File

@@ -30,6 +30,8 @@ namespace OrmTest.UnitTest
var data = db.Queryable<StudentEnum>().AS("student").InSingle(id); var data = db.Queryable<StudentEnum>().AS("student").InSingle(id);
shoolValue = SchoolEnum.UniversityOfOxford; shoolValue = SchoolEnum.UniversityOfOxford;
var sql= db.Updateable<StudentEnum>().AS("student").UpdateColumns(it=>new StudentEnum() { Name="a" , SchoolId= shoolValue }).Where(it=>it.Id==id).ToSql(); var sql= db.Updateable<StudentEnum>().AS("student").UpdateColumns(it=>new StudentEnum() { Name="a" , SchoolId= shoolValue }).Where(it=>it.Id==id).ToSql();
var sql2 = db.Updateable<StudentEnum>().AS("student").UpdateColumns(it => new StudentEnum() { Name = "a", SchoolId = SchoolEnum.UniversityOfOxford }).Where(it => it.Id == id).ToSql();
} }
} }
} }

10
Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/ExpressionTool.cs
View File

@@ -46,6 +46,16 @@ namespace SqlSugar
return null; return null;
} }
} }
public static object GetValue(object value)
{
if (value == null) return value;
var type = value.GetType();
if (type.IsEnum()&& type != typeof(DateType)&& type!=typeof(JoinType)&&type!=typeof(OrderByType)) return Convert.ToInt64(value);
else
return value;
}
public static bool IsLogicOperator(string operatorValue) public static bool IsLogicOperator(string operatorValue)
{ {
return operatorValue == "&&" || operatorValue == "||"; return operatorValue == "&&" || operatorValue == "||";

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs
View File

@@ -12,7 +12,7 @@ namespace SqlSugar
{ {
var expression = base.Expression as ConstantExpression; var expression = base.Expression as ConstantExpression;
var isLeft = parameter.IsLeft; var isLeft = parameter.IsLeft;
object value = expression.Value; object value = ExpressionTool.GetValue(expression.Value);
var baseParameter = parameter.BaseParameter; var baseParameter = parameter.BaseParameter;
baseParameter.ChildExpression = expression; baseParameter.ChildExpression = expression;
var isSetTempData = baseParameter.CommonTempData.IsValuable() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result); var isSetTempData = baseParameter.CommonTempData.IsValuable() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);

4
Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.2.0.7")] [assembly: AssemblyVersion("4.2.0.8")]
[assembly: AssemblyFileVersion("4.2.0.7")] [assembly: AssemblyFileVersion("4.2.0.8")]