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

- 修复 3.2.670 中 UseNameConvert 无效；#1270

Browse Source
This commit is contained in:
2881099
2022-09-25 09:07:49 +08:00
parent 9f80879d68
commit bc98f167e9
2 changed files with 123 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
FreeSql/Internal/CommonUtils.cs
View File

@ -128,7 +128,7 @@ namespace FreeSql.Internal
{
ModifyResult = new TableAttribute
{
Name = attr.Name,
Name = attr.Name ?? type.Name,
OldName = attr.OldName,
_DisableSyncStructure = attr._DisableSyncStructure,
AsTable = attr.AsTable
@ -136,7 +136,7 @@ namespace FreeSql.Internal
};
_orm.Aop.ConfigEntityHandler(_orm, aope);
var tryattr = aope.ModifyResult;
if (!string.IsNullOrEmpty(tryattr.Name)) attr.Name = tryattr.Name;
if (!string.IsNullOrEmpty(tryattr.Name) && tryattr.Name != type.Name) attr.Name = tryattr.Name;
if (!string.IsNullOrEmpty(tryattr.OldName)) attr.OldName = tryattr.OldName;
if (tryattr._DisableSyncStructure != null) attr._DisableSyncStructure = tryattr.DisableSyncStructure;
if (!string.IsNullOrEmpty(tryattr.AsTable)) attr.AsTable = tryattr.AsTable;
@ -194,7 +194,7 @@ namespace FreeSql.Internal
{
ModifyResult = new ColumnAttribute
{
Name = attr.Name,
Name = attr.Name ?? proto.Name,
OldName = attr.OldName,
DbType = attr.DbType,
_IsPrimary = attr._IsPrimary,
@ -217,7 +217,7 @@ namespace FreeSql.Internal
};
_orm.Aop.ConfigEntityPropertyHandler(_orm, aope);
var tryattr = aope.ModifyResult;
if (!string.IsNullOrEmpty(tryattr.Name)) attr.Name = tryattr.Name;
if (!string.IsNullOrEmpty(tryattr.Name) && tryattr.Name != proto.Name) attr.Name = tryattr.Name;
if (!string.IsNullOrEmpty(tryattr.OldName)) attr.OldName = tryattr.OldName;
if (!string.IsNullOrEmpty(tryattr.DbType)) attr.DbType = tryattr.DbType;
if (tryattr._IsPrimary != null) attr._IsPrimary = tryattr.IsPrimary;