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

2881099 · 2881099 · commit 9e3b258ffdbd · 2023-09-21T20:08:17.000+08:00
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)
         {

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,14 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common)`
`258`	`258`	`commonNow = $"{commonNow.TrimEnd('(', ')')}({timeLength})";`
`259`	`259`	`commonNowUtc = $"{commonNowUtc.TrimEnd('(', ')')}({timeLength})";`
`260`	`260`	`}`
	`261`	`+ //https://github.com/dotnetcore/FreeSql/issues/1604 mysql 不支持默认值 utc_timestamp DDL`
	`262`	`+ if (colattr.ServerTime == DateTimeKind.Local)`
	`263`	`+ col.DbDefaultValue = commonNow;`
	`264`	`+ break;`
	`265`	`+ default:`
	`266`	`+ col.DbDefaultValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;`
`261`	`267`	`break;`
`262`	`268`	`}`
`263`		`- col.DbDefaultValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;`
`264`	`269`	`col.DbInsertValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;`
`265`	`270`	`col.DbUpdateValue = colattr.ServerTime == DateTimeKind.Local ? commonNow : commonNowUtc;`
`266`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public override string TrimQuoteSqlName(string name)`
`68`	`68`	`public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";`
`69`	`69`	`public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";`
`70`	`70`	`public override string Now => "now()";`
`71`		`- public override string NowUtc => "current_timestamp()";`
	`71`	`+ public override string NowUtc => "utc_timestamp()";`
`72`	`72`
`73`	`73`	`public override string QuoteWriteParamterAdapter(Type type, string paramterName)`
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public override string TrimQuoteSqlName(string name)`
`100`	`100`	`public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";`
`101`	`101`	`public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";`
`102`	`102`	`public override string Now => "now()";`
`103`		`- public override string NowUtc => "current_timestamp()";`
	`103`	`+ public override string NowUtc => "utc_timestamp()";`
`104`	`104`
`105`	`105`	`public override string QuoteWriteParamterAdapter(Type type, string paramterName)`
`106`	`106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public override string TrimQuoteSqlName(string name)`
`118`	`118`	`public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";`
`119`	`119`	`public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";`
`120`	`120`	`public override string Now => "now()";`
`121`		`- public override string NowUtc => "current_timestamp()";`
	`121`	`+ public override string NowUtc => "utc_timestamp()";`
`122`	`122`
`123`	`123`	`public override string QuoteWriteParamterAdapter(Type type, string paramterName)`
`124`	`124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public override string TrimQuoteSqlName(string name)`
`64`	`64`	`public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";`
`65`	`65`	`public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";`
`66`	`66`	`public override string Now => "now()";`
`67`		`- public override string NowUtc => "current_timestamp()";`
	`67`	`+ public override string NowUtc => "utc_timestamp()";`
`68`	`68`
`69`	`69`	`public override string QuoteWriteParamterAdapter(Type type, string paramterName)`
`70`	`70`	`{`