From e0ac811ed196d07076e5e283c14fc4fe37fa0e58 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Wed, 6 Sep 2023 15:14:47 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=20MySql=20=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20utc=5Ftimestamp=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E9=80=9F=E4=B8=BA=20current=5Ftimestamp=EF=BC=9B#1604?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Extensions/FreeSql.Generator/FreeSql.Generator.csproj           | 2 +-
 Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs     | 2 +-
 Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs      | 1 +
 Providers/FreeSql.Provider.MySql/MySqlUtils.cs                  | 2 +-
 .../FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs      | 2 +-
 Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs         | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
index a756e274..82f9b09f 100644
--- a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
+++ b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.2.701</Version>
+		<Version>3.2.702</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs
index 82db8cfc..41d81cf0 100644
--- a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs
+++ b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs
@@ -68,7 +68,7 @@ namespace FreeSql.Custom.MySql
         public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";
         public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";
         public override string Now => "now()";
-        public override string NowUtc => "utc_timestamp()";
+        public override string NowUtc => "current_timestamp()";
 
         public override string QuoteWriteParamterAdapter(Type type, string paramterName)
         {
diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs
index 141b9082..b3a23d6c 100644
--- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs
+++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs
@@ -48,6 +48,7 @@ namespace FreeSql.KingbaseES
                 case "varchar": ret = KdbndpDbType.Varchar; break;
                 case "text": ret = KdbndpDbType.Text; break;
 
+                case "datetime": ret = KdbndpDbType.Timestamp; break;
                 case "timestamp": ret = KdbndpDbType.Timestamp; break;
                 case "timestamptz": ret = KdbndpDbType.Timestamp; break;
                 case "date": ret = KdbndpDbType.Date; break;
diff --git a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
index a1622cc6..f8d17211 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
@@ -100,7 +100,7 @@ namespace FreeSql.MySql
         public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";
         public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";
         public override string Now => "now()";
-        public override string NowUtc => "utc_timestamp()";
+        public override string NowUtc => "current_timestamp()";
 
         public override string QuoteWriteParamterAdapter(Type type, string paramterName)
         {
diff --git a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
index ad08572d..27374291 100644
--- a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
+++ b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
@@ -118,7 +118,7 @@ namespace FreeSql.MySql
         public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";
         public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";
         public override string Now => "now()";
-        public override string NowUtc => "utc_timestamp()";
+        public override string NowUtc => "current_timestamp()";
 
         public override string QuoteWriteParamterAdapter(Type type, string paramterName)
         {
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs
index d78f43ea..c451aeb2 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs
@@ -64,7 +64,7 @@ namespace FreeSql.Odbc.MySql
         public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";
         public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";
         public override string Now => "now()";
-        public override string NowUtc => "utc_timestamp()";
+        public override string NowUtc => "current_timestamp()";
 
         public override string QuoteWriteParamterAdapter(Type type, string paramterName)
         {