lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-06-28 13:34:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Core

Browse Source
This commit is contained in:
sunkaixuan 2017-10-26 11:11:44 +08:00
parent 37f9d51c5e
commit 550014e9ee
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs
View File

@ -262,11 +262,11 @@ namespace SqlSugar
++i; ++i;
} }
} }
protected string GetDbColumnName(string columns) private string GetDbColumnName(string propertyName)
{ {
if (!IsMappingColumns) if (!IsMappingColumns)
{ {
return columns; return propertyName;
} }
if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase))) if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)))
{ {
@ -274,12 +274,12 @@ namespace SqlSugar
} }
if (MappingColumnList == null || !MappingColumnList.Any()) if (MappingColumnList == null || !MappingColumnList.Any())
{ {
return columns; return propertyName;
} }
else else
{ {
var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityName == EntityInfo.EntityName && it.PropertyName.Equals(columns, StringComparison.CurrentCultureIgnoreCase)); var mappInfo = this.MappingColumnList.FirstOrDefault(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
return mappInfo == null ? columns : mappInfo.DbColumnName; return mappInfo == null ? propertyName : mappInfo.DbColumnName;
} }
} }

10
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs
View File

@ -281,11 +281,11 @@ namespace SqlSugar
this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v => (SqlBuilder.SqlParameterKeyWord + SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName)); this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v => (SqlBuilder.SqlParameterKeyWord + SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName));
} }
} }
private string GetDbColumnName(string entityName) private string GetDbColumnName(string propertyName)
{ {
if (!IsMappingColumns) if (!IsMappingColumns)
{ {
return entityName; return propertyName;
} }
if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase))) if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)))
{ {
@ -293,12 +293,12 @@ namespace SqlSugar
} }
if (MappingColumnList == null || !MappingColumnList.Any()) if (MappingColumnList == null || !MappingColumnList.Any())
{ {
return entityName; return propertyName;
} }
else else
{ {
var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.PropertyName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)); var mappInfo = this.MappingColumnList.FirstOrDefault(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
return mappInfo == null ? entityName : mappInfo.DbColumnName; return mappInfo == null ? propertyName : mappInfo.DbColumnName;
} }
} }
private List<string> GetPrimaryKeys() private List<string> GetPrimaryKeys()

4
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnectionConfig.cs
View File

@ -1,4 +1,5 @@
using System; using Newtonsoft.Json;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -26,6 +27,7 @@ namespace SqlSugar
/// <summary> /// <summary>
/// Configure External Services replace default services,For example, Redis storage /// Configure External Services replace default services,For example, Redis storage
/// </summary> /// </summary>
[JsonIgnore]
public ConfigureExternalServices ConfigureExternalServices = _DefaultServices; public ConfigureExternalServices ConfigureExternalServices = _DefaultServices;
private static ConfigureExternalServices _DefaultServices = new ConfigureExternalServices(); private static ConfigureExternalServices _DefaultServices = new ConfigureExternalServices();
/// <summary> /// <summary>