Merge branch 'master-robin'

This commit is contained in:
20521097
2022-10-28 15:58:58 +08:00
2 changed files with 4 additions and 1 deletions

View File

@@ -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)

View File

@@ -461,6 +461,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();