tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 18:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 枚举属性的默认值容错，枚举下标不存在 0 的时候，mysql 迁移结构默认值报错；

Browse Source
This commit is contained in:
28810 2019-10-09 16:56:24 +08:00
parent 236d03f98c
commit 1f2d4abdc7
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/UnitTest1.cs Normal file
View File

@ -0,0 +1,37 @@
using System;
using System.Collections.Generic;
using System.Text;
using Xunit;
namespace FreeSql.Tests.MySqlConnector
{
public class UnitTest1
{
public class TestAddEnum
{
public Guid Id { get; set; }
public TestAddEnumType Type { get; set; }
public PermissionTypeEnum TestType { get; set; }
}
public enum TestAddEnumType { 中国人, 日本人 }
public enum PermissionTypeEnum
{
/// <summary>
/// 菜单
/// </summary>
Menu = 1,
/// <summary>
/// 接口
/// </summary>
Api = 2
}
[Fact]
public void Test1()
{
g.mysql.Select<TestAddEnum>().ToList();
}
}
}

8
FreeSql.Tests/FreeSql.Tests/UnitTest1.cs
View File

@ -408,10 +408,18 @@ namespace FreeSql.Tests
public Guid? Id { get; set; }
public string xxx { get; set; }
}
public class TestAddEnum
{
public Guid Id { get; set; }
public TestAddEnumType Type { get; set; }
}
public enum TestAddEnumType { 中国人, 日本人 }
[Fact]
public void Test1()
{
g.mysql.Select<TestAddEnum>().ToList();
g.sqlite.Insert(new TestGuidId { xxx = "111" }).ExecuteAffrows();
g.sqlite.Insert(new TestGuidId { xxx = "222" }).ExecuteAffrows();
var gkkdk1 = g.sqlite.Select<TestGuidId>().Where(a => true).ToList();

13
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -153,6 +153,19 @@ namespace FreeSql.Internal
continue;
}
if (entityDefault != null) colattr.DbDefautValue = trytb.Properties[p.Name].GetValue(entityDefault);
if (p.PropertyType.IsEnum)
{
var isEqualsEnumValue = false;
var enumValues = Enum.GetValues(p.PropertyType);
for (var a = 0; a < enumValues.Length; a++)
if (object.Equals(colattr.DbDefautValue, enumValues.GetValue(a)))
{
isEqualsEnumValue = true;
break;
}
if (isEqualsEnumValue == false)
colattr.DbDefautValue = enumValues.Length > 0 ? enumValues.GetValue(0) : null;
}
if (colattr.DbDefautValue != null && p.PropertyType != colattr.MapType) colattr.DbDefautValue = Utils.GetDataReaderValue(colattr.MapType, colattr.DbDefautValue);
if (colattr.DbDefautValue == null) colattr.DbDefautValue = tp?.defaultValue;
if (colattr.IsNullable == false && colattr.DbDefautValue == null)