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

同步代码

Browse Source
This commit is contained in:
sunkaixuan
2023-03-28 17:10:48 +08:00
parent 6bdfaa34be
commit ecf1718ab7
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.NetCore2/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs
View File

@@ -211,7 +211,7 @@ namespace SqlSugar
var date = dr.GetValue(i);
if (date is DateTime)
{
return UtilMethods.GetDateTimeOffsetByDateTime((DateTime)(date));
return new DateTimeOffset((DateTime)(date));
}
else
{
@@ -229,7 +229,7 @@ namespace SqlSugar
var date = dr.GetValue(i);
if (date is DateTime)
{
return UtilMethods.GetDateTimeOffsetByDateTime((DateTime)(date));
return new DateTimeOffset((DateTime)(date));
}
else
{

5
Src/Asp.NetCore2/SqlSugar/Realization/MySql/DbMaintenance/MySqlDbMaintenance.cs
View File

@@ -410,6 +410,7 @@ namespace SqlSugar
}
public override bool AddRemark(EntityInfo entity)
{
var oldColumns = this.Context.DbMaintenance.GetColumnInfosByTableName(entity.DbTableName, false);
var db = this.Context;
db.DbMaintenance.AddTableRemark(entity.DbTableName, entity.TableDescription);
List<EntityColumnInfo> columns = entity.Columns.Where(it => it.IsIgnore == false).ToList();
@@ -422,10 +423,14 @@ namespace SqlSugar
{
item.Length = 36;
}
var columnInfo = oldColumns.FirstOrDefault(it => it.DbColumnName.EqualCase(item.DbColumnName));
if (columnInfo.ColumnDescription.ObjToString() != item.ColumnDescription.ObjToString())
{
string sql = GetUpdateColumnSql(entity.DbTableName, mySqlCodeFirst.GetEntityColumnToDbColumn(entity, entity.DbTableName, item)) + " " + (item.IsIdentity ? "AUTO_INCREMENT" : "") + " " + " COMMENT '" + item.ColumnDescription + "'";
db.Ado.ExecuteCommand(sql);
}
}
}
return true;
}
protected override string GetCreateTableSql(string tableName, List<DbColumnInfo> columns)

8
Src/Asp.NetCore2/SqlSugar/Utilities/UtilConvert.cs
View File

@@ -141,6 +141,10 @@ namespace SqlSugar
public static DateTime ObjToDate(this object thisValue)
{
if (thisValue is DateTime)
{
return (DateTime)thisValue;
}
DateTime reval = DateTime.MinValue;
if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out reval))
{
@@ -151,6 +155,10 @@ namespace SqlSugar
public static DateTime ObjToDate(this object thisValue, DateTime errorValue)
{
if (thisValue is DateTime)
{
return (DateTime)thisValue;
}
DateTime reval = DateTime.MinValue;
if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out reval))
{