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

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-09-13 14:12:31 +08:00
parent d435b21326
commit f13fba5f66
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs
View File

@ -408,6 +408,7 @@ namespace SqlSugar
dbColumns.Any(dc => dc.DbColumnName.EqualCase(ec.DbColumnName) dbColumns.Any(dc => dc.DbColumnName.EqualCase(ec.DbColumnName)
&& ((ec.Length != dc.Length && !UtilMethods.GetUnderType(ec.PropertyInfo).IsEnum() && UtilMethods.GetUnderType(ec.PropertyInfo).IsIn(UtilConstants.StringType)) || && ((ec.Length != dc.Length && !UtilMethods.GetUnderType(ec.PropertyInfo).IsEnum() && UtilMethods.GetUnderType(ec.PropertyInfo).IsIn(UtilConstants.StringType)) ||
ec.IsNullable != dc.IsNullable || ec.IsNullable != dc.IsNullable ||
IsNoSamePrecision(ec, dc) ||
IsNoSamgeType(ec, dc)))).ToList(); IsNoSamgeType(ec, dc)))).ToList();
var renameColumns = entityColumns var renameColumns = entityColumns
.Where(it => !string.IsNullOrEmpty(it.OldDbColumnName)) .Where(it => !string.IsNullOrEmpty(it.OldDbColumnName))
@ -500,6 +501,15 @@ namespace SqlSugar
} }
} }
private bool IsNoSamePrecision(EntityColumnInfo ec, DbColumnInfo dc)
{
if (this.Context.CurrentConnectionConfig.MoreSettings?.EnableCodeFirstUpdatePrecision == true)
{
return ec.DecimalDigits != dc.DecimalDigits && ec.UnderType.IsIn(UtilConstants.DobType,UtilConstants.DecType);
}
return false;
}
protected virtual void KeyAction(EntityColumnInfo item, DbColumnInfo dbColumn, out bool pkDiff, out bool idEntityDiff) protected virtual void KeyAction(EntityColumnInfo item, DbColumnInfo dbColumn, out bool pkDiff, out bool idEntityDiff)
{ {
pkDiff = item.IsPrimarykey != dbColumn.IsPrimarykey; pkDiff = item.IsPrimarykey != dbColumn.IsPrimarykey;

1
Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs
View File

@ -25,5 +25,6 @@ namespace SqlSugar
public bool IsAutoDeleteQueryFilter { get; set; } public bool IsAutoDeleteQueryFilter { get; set; }
public bool EnableModelFuncMappingColumn { get; set; } public bool EnableModelFuncMappingColumn { get; set; }
public bool EnableOracleIdentity { get; set; } public bool EnableOracleIdentity { get; set; }
public bool EnableCodeFirstUpdatePrecision { get; set; }
} }
} }

3
Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
View File

@ -471,7 +471,8 @@ namespace SqlSugar
IsAutoUpdateQueryFilter = it.MoreSettings.IsAutoUpdateQueryFilter, IsAutoUpdateQueryFilter = it.MoreSettings.IsAutoUpdateQueryFilter,
EnableModelFuncMappingColumn=it.MoreSettings.EnableModelFuncMappingColumn, EnableModelFuncMappingColumn=it.MoreSettings.EnableModelFuncMappingColumn,
EnableOracleIdentity = it.MoreSettings.EnableOracleIdentity, EnableOracleIdentity = it.MoreSettings.EnableOracleIdentity,
IsWithNoLockSubquery=it.MoreSettings.IsWithNoLockSubquery IsWithNoLockSubquery=it.MoreSettings.IsWithNoLockSubquery,
EnableCodeFirstUpdatePrecision=it.MoreSettings.EnableCodeFirstUpdatePrecision
}, },
SqlMiddle = it.SqlMiddle == null ? null : new SqlMiddle SqlMiddle = it.SqlMiddle == null ? null : new SqlMiddle