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

-

Browse Source
This commit is contained in:
sunkaixuan
2017-05-23 06:21:59 +08:00
parent ff1fc0cf41
commit c65e136dd1
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SqlSugar/Abstract/EntityProvider/EntityProvider.cs
View File

@@ -84,7 +84,7 @@ namespace SqlSugar
if (this.Context.MappingColumns == null || this.Context.MappingColumns.Count == 0) return entityPropertyName; if (this.Context.MappingColumns == null || this.Context.MappingColumns.Count == 0) return entityPropertyName;
else else
{ {
var mappingInfo = this.Context.MappingColumns.SingleOrDefault(it => it.EntityName == typeName && it.EntityPropertyName == entityPropertyName); var mappingInfo = this.Context.MappingColumns.SingleOrDefault(it => it.EntityName == typeName && it.PropertyName == entityPropertyName);
return mappingInfo == null ? entityPropertyName : mappingInfo.DbColumnName; return mappingInfo == null ? entityPropertyName : mappingInfo.DbColumnName;
} }
} }

2
SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs
View File

@@ -161,7 +161,7 @@ namespace SqlSugar
} }
else else
{ {
var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityPropertyName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)); var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.PropertyName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase));
return mappInfo == null ? entityName : mappInfo.DbColumnName; return mappInfo == null ? entityName : mappInfo.DbColumnName;
} }
} }

2
SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs
View File

@@ -192,7 +192,7 @@ namespace SqlSugar
} }
else else
{ {
var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityPropertyName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)); var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.PropertyName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase));
return mappInfo == null ? entityName : mappInfo.DbColumnName; return mappInfo == null ? entityName : mappInfo.DbColumnName;
} }
} }

2
SqlSugar/Entities/Mapping/MappingColumn.cs
View File

@@ -7,7 +7,7 @@ namespace SqlSugar
{ {
public class MappingColumn public class MappingColumn
{ {
public string EntityPropertyName { get; set; } public string PropertyName { get; set; }
public string DbColumnName { get; set; } public string DbColumnName { get; set; }
public string EntityName { get; set; } public string EntityName { get; set; }
} }

4
SqlSugar/Entities/SugarList.cs
View File

@@ -41,8 +41,8 @@ namespace SqlSugar
{ {
public void Add(string propertyName, string dbColumnName, string entityName) public void Add(string propertyName, string dbColumnName, string entityName)
{ {
this.RemoveAll(it => it.EntityPropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); this.RemoveAll(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
this.Add(new MappingColumn() { EntityPropertyName = propertyName, DbColumnName = dbColumnName, EntityName = entityName }); this.Add(new MappingColumn() { PropertyName = propertyName, DbColumnName = dbColumnName, EntityName = entityName });
} }
public new void Clear() public new void Clear()
{ {

4
SqlSugar/ExpressionsToSql/ExpressionContext.cs
View File

@@ -114,7 +114,7 @@ namespace SqlSugar
if (name.Contains(".")) if (name.Contains("."))
{ {
var columnInfo = name.Split('.'); var columnInfo = name.Split('.');
var mappingInfo = this.MappingColumns.FirstOrDefault(it => it.EntityPropertyName.Equals(columnInfo.Last(), StringComparison.CurrentCultureIgnoreCase)); var mappingInfo = this.MappingColumns.FirstOrDefault(it => it.PropertyName.Equals(columnInfo.Last(), StringComparison.CurrentCultureIgnoreCase));
if (mappingInfo != null) if (mappingInfo != null)
{ {
columnInfo[columnInfo.Length - 1] = mappingInfo.DbColumnName; columnInfo[columnInfo.Length - 1] = mappingInfo.DbColumnName;
@@ -123,7 +123,7 @@ namespace SqlSugar
} }
else else
{ {
var mappingInfo = this.MappingColumns.FirstOrDefault(it => it.EntityPropertyName.Equals(name, StringComparison.CurrentCultureIgnoreCase)); var mappingInfo = this.MappingColumns.FirstOrDefault(it => it.PropertyName.Equals(name, StringComparison.CurrentCultureIgnoreCase));
return "[" + (mappingInfo == null ? name : mappingInfo.DbColumnName) + "]"; return "[" + (mappingInfo == null ? name : mappingInfo.DbColumnName) + "]";
} }
} }

2
SqlSugar/Realization/SqlServer/Core/SqlBuilder/SqlServerBuilder.cs
View File

@@ -26,7 +26,7 @@ namespace SqlSugar
.MappingColumns .MappingColumns
.FirstOrDefault(it => .FirstOrDefault(it =>
it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)&& it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)&&
it.EntityPropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
return (mappingInfo == null ? "["+ propertyName + "]" : "["+mappingInfo.DbColumnName+"]"); return (mappingInfo == null ? "["+ propertyName + "]" : "["+mappingInfo.DbColumnName+"]");
} }