- 恢复 MySql ServerTime = Utc ；#1604 #1624

dotnetcore · Sep 21, 2023 · 9e3b258 · 9e3b258
1 parent be6f2fa
commit 9e3b258
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs
@@ -258,9 +258,14 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common)
                                 commonNow = $"{commonNow.TrimEnd('(', ')')}({timeLength})";
                                 commonNowUtc = $"{commonNowUtc.TrimEnd('(', ')')}({timeLength})";
                             }
+                            //https://github.com/dotnetcore/FreeSql/issues/1604 mysql 不支持默认值 utc_timestamp DDL
+                            if (colattr.ServerTime == DateTimeKind.Local)
+                                col.DbDefaultValue = commonNow;
+                            break;
+                        default:
+                            col.DbDefaultValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;
                             break;
                     }
-                    col.DbDefaultValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;
                     col.DbInsertValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;
                     col.DbUpdateValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;
                 }

diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs
@@ -68,7 +68,7 @@ public override string TrimQuoteSqlName(string name)
         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 => "current_timestamp()";
+        public override string NowUtc => "utc_timestamp()";
 
         public override string QuoteWriteParamterAdapter(Type type, string paramterName)
         {

diff --git a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
@@ -100,7 +100,7 @@ public override string TrimQuoteSqlName(string name)
         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 => "current_timestamp()";
+        public override string NowUtc => "utc_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
@@ -118,7 +118,7 @@ public override string TrimQuoteSqlName(string name)
         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 => "current_timestamp()";
+        public override string NowUtc => "utc_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
@@ -64,7 +64,7 @@ public override string TrimQuoteSqlName(string name)
         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 => "current_timestamp()";
+        public override string NowUtc => "utc_timestamp()";
 
         public override string QuoteWriteParamterAdapter(Type type, string paramterName)
         {