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

Update entityMain bug

Browse Source
This commit is contained in:
sunkaixuna
2021-10-31 09:27:30 +08:00
parent c74b6c2381
commit 71dcf6ee84
1 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@@ -54,23 +54,12 @@ namespace SqlSugar
public string GetTableName<T>() public string GetTableName<T>()
{ {
var typeName = typeof(T).Name; return GetTableName(typeof(T));
if (this.Context.MappingTables == null || this.Context.MappingTables.Count == 0)
{
var entity = this.GetEntityInfo<T>();
if (entity.DbTableName.HasValue()) return entity.DbTableName;
else return entity.EntityName;
}
else
{
var mappingInfo = this.Context.MappingTables.SingleOrDefault(it => it.EntityName == typeName);
return mappingInfo == null ? typeName : mappingInfo.DbTableName;
}
} }
public string GetTableName(Type entityType) public string GetTableName(Type entityType)
{ {
var typeName = entityType.Name; var typeName = entityType.Name;
if (this.Context.MappingTables == null || this.Context.MappingTables.Count == 0) if (this.Context.MappingTables == null || this.Context.MappingTables.Count == 0 || !this.Context.MappingTables.Any(it => it.EntityName == typeName))
{ {
var entity = this.GetEntityInfo(entityType); var entity = this.GetEntityInfo(entityType);
if (entity.DbTableName.HasValue()) return entity.DbTableName; if (entity.DbTableName.HasValue()) return entity.DbTableName;
@@ -103,27 +92,14 @@ namespace SqlSugar
} }
public string GetDbColumnName<T>(string propertyName) public string GetDbColumnName<T>(string propertyName)
{ {
var isAny = this.GetEntityInfo<T>().Columns.Any(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); return GetDbColumnName(propertyName,typeof(T));
Check.Exception(!isAny, "Property " + propertyName + " is Invalid");
var typeName = typeof(T).Name;
if (this.Context.MappingColumns == null || this.Context.MappingColumns.Count == 0)
{
var column= this.GetEntityInfo<T>().Columns.First(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
if (column.DbColumnName.HasValue()) return column.DbColumnName;
else return column.PropertyName;
}
else
{
var mappingInfo = this.Context.MappingColumns.SingleOrDefault(it => it.EntityName == typeName && it.PropertyName == propertyName);
return mappingInfo == null ? propertyName : mappingInfo.DbColumnName;
}
} }
public string GetDbColumnName(string propertyName,Type entityType) public string GetDbColumnName(string propertyName,Type entityType)
{ {
var isAny = this.GetEntityInfo(entityType).Columns.Any(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); var isAny = this.GetEntityInfo(entityType).Columns.Any(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
Check.Exception(!isAny, "Property " + propertyName + " is Invalid"); Check.Exception(!isAny, "Property " + propertyName + " is Invalid");
var typeName = entityType.Name; var typeName = entityType.Name;
if (this.Context.MappingColumns == null || this.Context.MappingColumns.Count == 0) if (this.Context.MappingColumns == null || this.Context.MappingColumns.Count == 0 || !this.Context.MappingColumns.Any(it => it.EntityName == typeName && it.PropertyName == propertyName))
{ {
var column = this.GetEntityInfo(entityType).Columns.First(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); var column = this.GetEntityInfo(entityType).Columns.First(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
if (column.DbColumnName.HasValue()) return column.DbColumnName; if (column.DbColumnName.HasValue()) return column.DbColumnName;