tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 18:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 完善 [Column(ServerTime = Utc)] 特性，对 Update 时也能生效；

Browse Source
This commit is contained in:
28810 2020-01-06 19:36:30 +08:00
parent bbba06a343
commit fbbd74f54c
11 changed files with 82 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlCodeFirstTest.cs
View File

@ -28,6 +28,8 @@ namespace FreeSql.Tests.MySqlConnector
Assert.NotNull(item2); Assert.NotNull(item2);
Assert.Equal(item.编号, item2.编号); Assert.Equal(item.编号, item2.编号);
Assert.Equal(item.标题, item2.标题); Assert.Equal(item.标题, item2.标题);
g.mysql.Update<测试中文表2>().SetSource(item2).ExecuteAffrows();
} }
class 测试中文表2 class 测试中文表2
{ {
@ -36,8 +38,11 @@ namespace FreeSql.Tests.MySqlConnector
public string 标题 { get; set; } public string 标题 { get; set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; set; } public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
} }
[Fact] [Fact]

5
FreeSql.Tests/FreeSql.Tests/MsAccess/MsAccessCodeFirstTest.cs
View File

@ -36,8 +36,11 @@ namespace FreeSql.Tests.MsAccess
public string 标题 { get; set; } public string 标题 { get; set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; set; } public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
} }
[Fact] [Fact]

5
FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs
View File

@ -32,9 +32,12 @@ namespace FreeSql.Tests.MySql
public string 标题 { get; protected set; } public string 标题 { get; protected set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; protected set; } public DateTime 创建时间 { get; protected set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
public static 测试中文表2 Create(string title, DateTime ctm) public static 测试中文表2 Create(string title, DateTime ctm)
{ {
return new 测试中文表2 { 标题 = title, 创建时间 = ctm }; return new 测试中文表2 { 标题 = title, 创建时间 = ctm };

5
FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs
View File

@ -36,8 +36,11 @@ namespace FreeSql.Tests.Oracle
public string 标题 { get; set; } public string 标题 { get; set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; set; } public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
} }
[Fact] [Fact]

5
FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLCodeFirstTest.cs
View File

@ -43,8 +43,11 @@ namespace FreeSql.Tests.PostgreSQL
public string 标题 { get; set; } public string 标题 { get; set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; set; } public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
} }
[Fact] [Fact]

5
FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerCodeFirstTest.cs
View File

@ -37,8 +37,11 @@ namespace FreeSql.Tests.SqlServer
public string 标题 { get; set; } public string 标题 { get; set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; set; } public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
} }

5
FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteCodeFirstTest.cs
View File

@ -36,8 +36,11 @@ namespace FreeSql.Tests.Sqlite
public string 标题 { get; set; } public string 标题 { get; set; }
[Column(ServerTime = DateTimeKind.Local)] [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
public DateTime 创建时间 { get; set; } public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Local)]
public DateTime 更新时间 { get; set; }
} }
[Fact] [Fact]

5
FreeSql.Tests/FreeSql.Tests/UnitTest3.cs
View File

@ -121,8 +121,11 @@ namespace FreeSql.Tests
public byte[] Binary { get; set; } public byte[] Binary { get; set; }
[Column(ServerTime = DateTimeKind.Utc, CanUpdate = false)]
public DateTime 创建时间 { get; set; }
[Column(ServerTime = DateTimeKind.Utc)] [Column(ServerTime = DateTimeKind.Utc)]
public DateTime CreateTime { get; set; } public DateTime 更新时间 { get; set; }
[Column(InsertValueSql = "'123'")] [Column(InsertValueSql = "'123'")]
public string InsertValue2 { get; set; } public string InsertValue2 { get; set; }

19
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@ -557,6 +557,11 @@ namespace FreeSql.Internal.CommonProvider
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = "); sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ");
if (col.Attribute.CanUpdate && string.IsNullOrEmpty(col.DbUpdateValue) == false)
sb.Append(col.DbUpdateValue);
else
{
var val = col.GetMapValue(_source.First()); var val = col.GetMapValue(_source.First());
if (_noneParameter) if (_noneParameter)
sb.Append(_commonUtils.GetNoneParamaterSqlValue(_paramsSource, col.Attribute.MapType, val)); sb.Append(_commonUtils.GetNoneParamaterSqlValue(_paramsSource, col.Attribute.MapType, val));
@ -565,6 +570,7 @@ namespace FreeSql.Internal.CommonProvider
sb.Append(_commonUtils.QuoteWriteParamter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_paramsSource.Count}"))); sb.Append(_commonUtils.QuoteWriteParamter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_paramsSource.Count}")));
_commonUtils.AppendParamter(_paramsSource, null, col, col.Attribute.MapType, val); _commonUtils.AppendParamter(_paramsSource, null, col, col.Attribute.MapType, val);
} }
}
++colidx; ++colidx;
} }
} }
@ -589,6 +595,10 @@ namespace FreeSql.Internal.CommonProvider
if (colidx > 0) sb.Append(", "); if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = "); sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ");
if (col.Attribute.CanUpdate && string.IsNullOrEmpty(col.DbUpdateValue) == false)
sb.Append(col.DbUpdateValue);
else
{
var nulls = 0; var nulls = 0;
var cwsb = new StringBuilder().Append(cw); var cwsb = new StringBuilder().Append(cw);
foreach (var d in _source) foreach (var d in _source)
@ -614,7 +624,7 @@ namespace FreeSql.Internal.CommonProvider
sb.Append(cwsb.ToString()); sb.Append(cwsb.ToString());
} }
cwsb.Clear(); cwsb.Clear();
}
++colidx; ++colidx;
} }
} }
@ -626,6 +636,13 @@ namespace FreeSql.Internal.CommonProvider
if (_setIncr.Length > 0) if (_setIncr.Length > 0)
sb.Append(_set.Length > 0 ? _setIncr.ToString() : _setIncr.ToString().Substring(2)); sb.Append(_set.Length > 0 ? _setIncr.ToString() : _setIncr.ToString().Substring(2));
if (_source.Any() == false)
{
foreach (var col in _table.Columns.Values)
if (col.Attribute.CanUpdate && string.IsNullOrEmpty(col.DbUpdateValue) == false)
sb.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
}
if (_table.VersionColumn != null) if (_table.VersionColumn != null)
{ {
var vcname = _commonUtils.QuoteSqlName(_table.VersionColumn.Attribute.Name); var vcname = _commonUtils.QuoteSqlName(_table.VersionColumn.Attribute.Name);

1
FreeSql/Internal/Model/ColumnInfo.cs
View File

@ -16,6 +16,7 @@ namespace FreeSql.Internal.Model
public string DbTypeText { get; internal set; } public string DbTypeText { get; internal set; }
public string DbDefaultValue { get; internal set; } public string DbDefaultValue { get; internal set; }
public string DbInsertValue { get; internal set; } public string DbInsertValue { get; internal set; }
public string DbUpdateValue { get; internal set; }
public int DbSize { get; internal set; } public int DbSize { get; internal set; }
public byte DbPrecision { get; internal set; } public byte DbPrecision { get; internal set; }
public byte DbScale { get; internal set; } public byte DbScale { get; internal set; }

3
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -188,8 +188,9 @@ namespace FreeSql.Internal
//} //}
if (colattr.ServerTime != DateTimeKind.Unspecified && new[] { typeof(DateTime), typeof(DateTimeOffset) }.Contains(colattr.MapType.NullableTypeOrThis())) if (colattr.ServerTime != DateTimeKind.Unspecified && new[] { typeof(DateTime), typeof(DateTimeOffset) }.Contains(colattr.MapType.NullableTypeOrThis()))
{ {
col.DbDefaultValue = colattr.ServerTime == DateTimeKind.Local ? common.Now : common.NowUtc; col.DbDefaultValue = "'1970-1-1'";
col.DbInsertValue = colattr.ServerTime == DateTimeKind.Local ? common.Now : common.NowUtc; col.DbInsertValue = colattr.ServerTime == DateTimeKind.Local ? common.Now : common.NowUtc;
col.DbUpdateValue = colattr.ServerTime == DateTimeKind.Local ? common.Now : common.NowUtc;
} }
if (string.IsNullOrEmpty(colattr.InsertValueSql) == false) if (string.IsNullOrEmpty(colattr.InsertValueSql) == false)
{ {