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

- 修复 因兼容 #184 导致 MySql Enum 表达式解析为 int 的 bug；

Browse Source 
- 修复 FreeSql.Provider.MySqlConnector Enum 自定义元素值，导致值计算错误的 bug；
This commit is contained in:
28810
2020-03-31 21:43:07 +08:00
parent c6c874f612
commit d4fd81679d
6 changed files with 358 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
View File

@ -3,6 +3,7 @@ using FreeSql.Internal.Model;
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Data.Common;
namespace FreeSql.MySql
@ -44,12 +45,11 @@ namespace FreeSql.MySql
{
ret.MySqlDbType = dbtype;
if (ret.MySqlDbType == MySqlDbType.Enum && value != null)
ret.Value = (long)Convert.ChangeType(value, typeof(long)) + 1;
ret.Value = EnumValueToMySql(col, value);
}
_params?.Add(ret);
return ret;
}
public override DbParameter[] GetDbParamtersByObject(string sql, object obj) =>
Utils.GetDbParamtersByObject<MySqlParameter>(sql, obj, "@", (name, type, value) =>
{
@ -66,12 +66,27 @@ namespace FreeSql.MySql
{
ret.MySqlDbType = (MySqlDbType)tp.Value;
if (ret.MySqlDbType == MySqlDbType.Enum && value != null)
ret.Value = (long)Convert.ChangeType(value, typeof(long)) + 1;
ret.Value = EnumValueToMySql(null, value);
}
}
return ret;
});
static ConcurrentDictionary<Type, Dictionary<string, int>> _dicEnumNames = new ConcurrentDictionary<Type, Dictionary<string, int>>();
static long EnumValueToMySql(ColumnInfo col, object value) //mysqlConnector 不支持 enumString 作为参数化传递，所以要计算出下标值，mysql 下标从 1 开始，并且 c# 设置了枚举元素值会影响下标
{
if (value == null) return 0;
if (value is Enum == false) return 0;
var names = _dicEnumNames.GetOrAdd(col?.Attribute.MapType ?? value.GetType(), type =>
{
var dic = new Dictionary<string, int>();
var ns = Enum.GetNames(type);
for (var a = 0; a < ns.Length; a++) dic.Add(ns[a], a + 1);
return dic;
});
return names.TryGetValue(value.ToString(), out var tryval) ? tryval : 0;
}
public override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args);
public override string QuoteSqlName(params string[] name)
{