Skip to content

Commit 795ba9c

Browse files
2881028810
authored andcommitted
update MySqlExpression DateTime ToString
1 parent 08713fb commit 795ba9c

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/DateTimeTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ public void this_ToString()
7070
Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH")));
7171
Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd")));
7272
Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM")));
73+
Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss")));
74+
Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm")));
75+
Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH")));
7376
Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd")));
7477
Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM")));
7578
Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy")));

FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/DateTimeTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ public void this_ToString()
7070
Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH")));
7171
Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd")));
7272
Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM")));
73+
Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss")));
74+
Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm")));
75+
Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH")));
7376
Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd")));
7477
Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM")));
7578
Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy")));

FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/DateTimeTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ public void this_ToString()
7070
Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH")));
7171
Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd")));
7272
Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM")));
73+
Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss")));
74+
Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm")));
75+
Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH")));
7376
Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd")));
7477
Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM")));
7578
Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy")));

Providers/FreeSql.Provider.MySql/MySqlExpression.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ public override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression ex
402402
case "'yyyy-MM-dd HH'": return $"date_format({left}, '%Y-%m-%d %H')";
403403
case "'yyyy-MM-dd'": return $"date_format({left}, '%Y-%m-%d')";
404404
case "'yyyy-MM'": return $"date_format({left}, '%Y-%m')";
405+
case "'yyyyMMddHHmmss'": return $"date_format({left}, '%Y%m%d%H%i%s')";
406+
case "'yyyyMMddHHmm'": return $"date_format({left}, '%Y%m%d%H%i')";
407+
case "'yyyyMMddHH'": return $"date_format({left}, '%Y%m%d%H')";
405408
case "'yyyyMMdd'": return $"date_format({left}, '%Y%m%d')";
406409
case "'yyyyMM'": return $"date_format({left}, '%Y%m')";
407410
case "'yyyy'": return $"date_format({left}, '%Y')";

Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ public override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression ex
402402
case "'yyyy-MM-dd HH'": return $"date_format({left}, '%Y-%m-%d %H')";
403403
case "'yyyy-MM-dd'": return $"date_format({left}, '%Y-%m-%d')";
404404
case "'yyyy-MM'": return $"date_format({left}, '%Y-%m')";
405+
case "'yyyyMMddHHmmss'": return $"date_format({left}, '%Y%m%d%H%i%s')";
406+
case "'yyyyMMddHHmm'": return $"date_format({left}, '%Y%m%d%H%i')";
407+
case "'yyyyMMddHH'": return $"date_format({left}, '%Y%m%d%H')";
405408
case "'yyyyMMdd'": return $"date_format({left}, '%Y%m%d')";
406409
case "'yyyyMM'": return $"date_format({left}, '%Y%m')";
407410
case "'yyyy'": return $"date_format({left}, '%Y')";

0 commit comments

Comments
 (0)