From 989cf290f645bb3552ff578ed0ba18e7d32cb7d0 Mon Sep 17 00:00:00 2001 From: Daily <963922242@qq.com> Date: Thu, 30 May 2024 11:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95ClickHouse=20=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0DateTime=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClickHouse/ClickhouseIssueTest.cs | 24 +++++++++++-------- .../Curd/ClickHouseUpdate.cs | 2 -- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickhouseIssueTest.cs b/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickhouseIssueTest.cs index 71bf127f..cf84442a 100644 --- a/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickhouseIssueTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickhouseIssueTest.cs @@ -22,7 +22,7 @@ namespace FreeSql.Tests.ClickHouse _fsql = new FreeSqlBuilder().UseConnectionString(DataType.ClickHouse, "Host=192.168.1.123;Port=8123;Database=test_issue;Compress=True;Min Pool Size=1") .UseMonitorCommand(cmd => _output.WriteLine($"线程:{cmd.CommandText}\r\n")) - .UseNoneCommandParameter(false) + .UseNoneCommandParameter(true) .UseAdoConnectionPool(true) .Build(); } @@ -45,22 +45,25 @@ namespace FreeSql.Tests.ClickHouse { Id = "9cd7af52-85cc-4d26-898a-4020cadb0491", Name = "update_name1", - UpdateTime = DateTime.Now + UpdateTime = DateTime.Now, + CreateTime = DateTime.Parse("2024-05-30 10:01:02") }); updatePerson.Add(new Person { Id = "bd9f9ed6-bd03-4675-abb4-12b7fdac7678", Name = "update_name2", - UpdateTime = DateTime.Now + UpdateTime = DateTime.Now, + CreateTime = DateTime.Parse("2024-05-30 10:01:02") }); - _fsql.Update().SetSource(updatePerson).UpdateColumns(person => new - { - person.Name, - person.UpdateTime, - }).ExecuteAffrows(); - + var sql = _fsql.Update().SetSource(updatePerson) + .UpdateColumns(person => new + { + person.Name, + person.UpdateTime, + person.CreateTime + }).ToSql(); } [Fact] @@ -94,6 +97,7 @@ namespace FreeSql.Tests.ClickHouse var insertMany = _fsql.Insert(persons).ExecuteAffrows(); } + [Fact] public void TestIssue1813CodeFirst2() { @@ -130,11 +134,11 @@ namespace FreeSql.Tests.ClickHouse } - public class Person { [Column(IsPrimary = true, IsIdentity = true)] public string Id { get; set; } + public string Name { get; set; } public int Age { get; set; } public DateTime CreateTime { get; set; } diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs index 740f63be..9f90cdab 100644 --- a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs +++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs @@ -173,8 +173,6 @@ namespace FreeSql.ClickHouse.Curd if (col.Attribute.MapType == typeof(DateTime) || col.Attribute.MapType == typeof(DateTime?) ) { //获取当前实时区 - var timeZone = TimeZoneInfo.Local; - colsql = $"toDateTime({colsql},'Asia/Shanghai')"; }