From 41e25fb7d08d80b58f69a1d9c6103ee998ce8c5f Mon Sep 17 00:00:00 2001 From: 20521097 <20521097@qq.com> Date: Fri, 28 Oct 2022 15:53:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9clickhouse?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?SimpleAggregateFunction=E7=9A=84=E8=BD=AC=E6=8D=A2=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs index 55896d176..bf444c755 100644 --- a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs +++ b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs @@ -460,6 +460,9 @@ namespace SqlSugar { if (Regex.IsMatch(dbTypeName, @"\(.+\)")) { + if (Regex.IsMatch(dbTypeName, @"SimpleAggregateFunction")) + dbTypeName = Regex.Match(dbTypeName, @"((?<=,\s)[^Nullable]\w+)|((?<=Nullable\()\w+)").Value; + else dbTypeName = Regex.Replace(dbTypeName, @"\(.+\)", ""); } dbTypeName = dbTypeName.Trim(); From 02ded5539157fc178033a1a1686eaabf320a61a3 Mon Sep 17 00:00:00 2001 From: 20521097 <20521097@qq.com> Date: Fri, 28 Oct 2022 15:56:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9clickhouse=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8BDateTime=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClickHouse/SqlBuilder/ClickHouseInsertBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar.ClickHouseCore/ClickHouse/SqlBuilder/ClickHouseInsertBuilder.cs b/Src/Asp.NetCore2/SqlSugar.ClickHouseCore/ClickHouse/SqlBuilder/ClickHouseInsertBuilder.cs index 6602e6c1e..b77be7898 100644 --- a/Src/Asp.NetCore2/SqlSugar.ClickHouseCore/ClickHouse/SqlBuilder/ClickHouseInsertBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar.ClickHouseCore/ClickHouse/SqlBuilder/ClickHouseInsertBuilder.cs @@ -98,7 +98,7 @@ namespace SqlSugar.ClickHouse { date = UtilMethods.GetMinDate(this.Context.CurrentConnectionConfig); } - return "'" + date.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'"; + return "'" + date.ToString("yyyy-MM-dd HH:mm:ss") + "'"; } private string GetString(object value)