Support enum

This commit is contained in:
sunkaixuan 2017-07-15 19:31:49 +08:00
parent eef317a3b7
commit b9c1567cc7
17 changed files with 39 additions and 59 deletions

View File

@ -33,12 +33,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MySql.Data">
<HintPath>..\SqlSugar\Lib\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\SqlSugar\Lib\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SyntacticSugar, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SqlServerTest\OtherDll\SyntacticSugar.dll</HintPath>

View File

@ -31,7 +31,7 @@ namespace OrmTest
new Update(1).Init();
new Mapping(1).Init();
new DataTest(1).Init();
new EnumTest(1).Init();
/***Performance Test***/
new SqlSugarPerformance(100).Select();

View File

@ -66,6 +66,7 @@
<Compile Include="PerformanceTesting\SqlSugarPerformance.cs" />
<Compile Include="UnitTest\DataTest.cs" />
<Compile Include="UnitTest\Delete.cs" />
<Compile Include="UnitTest\EnumTest.cs" />
<Compile Include="UnitTest\UnitTestBase.cs" />
<Compile Include="UnitTest\ExpressionTest\Field.cs" />
<Compile Include="UnitTest\Insert.cs" />

View File

@ -68,10 +68,5 @@ namespace OrmTest.UnitTest
throw new Exception("DataTest Error");
}
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
}

View File

@ -57,11 +57,5 @@ namespace OrmTest
new SugarParameter("@id",1)
}, t6.Key, t6.Value, "Delte t6 error");
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
}

View File

@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OrmTest.Demo;
using OrmTest.Models;
namespace OrmTest.UnitTest
{
public class EnumTest : UnitTestBase
{
private EnumTest() { }
public EnumTest(int eachCount)
{
this.Count = eachCount;
}
public void Init()
{
var db = GetInstance();
var shoolValue = SchoolEnum.HarvardUniversity;
var list = db.Queryable<StudentEnum>().AS("student").Where(it => it.SchoolId == shoolValue).ToList();
}
}
}

View File

@ -125,12 +125,6 @@ new List<SugarParameter>() {
new SugarParameter("@Name","张三")
}, t11.Key, t11.Value, "Insert t11 error");
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
public class MyStudent {

View File

@ -37,7 +37,7 @@ namespace OrmTest.UnitTest
var x2 = GetInstance();
}
public SqlSugarClient GetInstance()
public new SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() {InitKeyType=InitKeyType.Attribute, ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;

View File

@ -81,7 +81,7 @@ namespace OrmTest.UnitTest
}
public SqlSugarClient GetInstance()
public new SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer });
db.Ado.IsEnableLogEvent = true;

View File

@ -84,11 +84,5 @@ namespace OrmTest.UnitTest
}
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer });
return db;
}
}
}

View File

@ -108,12 +108,5 @@ namespace OrmTest.UnitTest
new SugarParameter("@InPara0",1) },t9.Key,t9.Value, "single t9 error");
}
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer });
return db;
}
}
}

View File

@ -23,10 +23,5 @@ namespace OrmTest.UnitTest
var x = db.Queryable<Student>().ToList();
}
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
}

View File

@ -9,10 +9,6 @@ namespace OrmTest.UnitTest
{
public class MapColumn : UnitTestBase
{
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer });
return db;
}
}
}

View File

@ -19,10 +19,5 @@ namespace OrmTest.UnitTest
var x = db.Queryable<Student>().ToList();
}
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
}

View File

@ -45,5 +45,11 @@ namespace OrmTest.UnitTest
}
}
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
}

View File

@ -145,10 +145,5 @@ namespace OrmTest.UnitTest
);
}
public SqlSugarClient GetInstance()
{
SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
return db;
}
}
}

View File

@ -174,6 +174,9 @@ namespace SqlSugar
{
var appendValue = this.Context.SqlParameterKeyWord + ExpressionConst.Const + Context.ParameterIndex;
Context.ParameterIndex++;
if (value != null && value.GetType().IsEnum) {
value = Convert.ToInt64(value);
}
this.Context.Parameters.Add(new SugarParameter(appendValue, value));
appendValue = string.Format(" {0} ", appendValue);
if (isLeft == true)