From 6bf4c21af0782e4524214b7eb52b29ebfa2f557f Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Thu, 30 May 2024 17:22:01 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=20=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E7=A9=BA=E9=97=B4=20FreeSql.Provider.ClickHouse.Attributes=20-?= =?UTF-8?q?>=20FreeSql.DataAnnotations=EF=BC=9B#1815?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Attributes/ClickHousePartitionAttribute.cs | 2 +- .../FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs | 8 +++----- .../FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Providers/FreeSql.Provider.ClickHouse/Attributes/ClickHousePartitionAttribute.cs b/Providers/FreeSql.Provider.ClickHouse/Attributes/ClickHousePartitionAttribute.cs index c19c31dd..6482a911 100644 --- a/Providers/FreeSql.Provider.ClickHouse/Attributes/ClickHousePartitionAttribute.cs +++ b/Providers/FreeSql.Provider.ClickHouse/Attributes/ClickHousePartitionAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace FreeSql.Provider.ClickHouse.Attributes +namespace FreeSql.DataAnnotations { [AttributeUsage(AttributeTargets.Property)] public class ClickHousePartitionAttribute : Attribute diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs index 110172ee..16282cab 100644 --- a/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs +++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs @@ -11,7 +11,7 @@ using System.Data.Common; using System.Reflection; using FreeSql.Internal.ObjectPool; using ClickHouse.Client.ADO; -using FreeSql.Provider.ClickHouse.Attributes; +using FreeSql.DataAnnotations; namespace FreeSql.ClickHouse { @@ -97,8 +97,7 @@ namespace FreeSql.ClickHouse { var arrayDbType = $"Array({value.dbtype})"; var defaultArray = new ArrayList(0); - return new DbInfoResult(Convert.ToInt32(DbType.Object), arrayDbType, arrayDbType, false, - defaultArray); + return new DbInfoResult(Convert.ToInt32(DbType.Object), arrayDbType, arrayDbType, false, defaultArray); } } @@ -176,8 +175,7 @@ namespace FreeSql.ClickHouse if (tb == null) throw new Exception(CoreStrings.S_Type_IsNot_Migrable(obj.tableSchema.Type.FullName)); if (tb.Columns.Any() == false) - throw new Exception( - CoreStrings.S_Type_IsNot_Migrable_0Attributes(obj.tableSchema.Type.FullName)); + throw new Exception(CoreStrings.S_Type_IsNot_Migrable_0Attributes(obj.tableSchema.Type.FullName)); var tbname = _commonUtils.SplitTableName(tb.DbName); if (tbname?.Length == 1) tbname = new[] { database, tbname[0] }; diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs index 9f90cdab..d6654aca 100644 --- a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs +++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs @@ -169,7 +169,7 @@ namespace FreeSql.ClickHouse.Curd var colsql = _noneParameter ? _commonUtils.GetNoneParamaterSqlValue(_paramsSource, "u", col, col.Attribute.MapType, val) : _commonUtils.QuoteWriteParamterAdapter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_paramsSource.Count}")); - //判断是否是DateTime类型,如果是DateTime类型,需要转换成ClickHouse支持的时间格式 + //判断是否是DateTime类型,如果是DateTime类型,需要转换成ClickHouse支持的时间格式 #1813 if (col.Attribute.MapType == typeof(DateTime) || col.Attribute.MapType == typeof(DateTime?) ) { //获取当前实时区