From 795ba9c833f65a50ba957b07e3ae4a85da3f7080 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Sun, 24 May 2020 03:05:15 +0800 Subject: [PATCH] update MySqlExpression DateTime ToString --- .../MySqlConnector/MySqlConnectorExpression/DateTimeTest.cs | 3 +++ .../MySql/MySqlExpression/DateTimeTest.cs | 3 +++ .../FreeSql.Tests/MySql/MySqlExpression/DateTimeTest.cs | 3 +++ Providers/FreeSql.Provider.MySql/MySqlExpression.cs | 3 +++ Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs | 3 +++ 5 files changed, 15 insertions(+) diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/DateTimeTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/DateTimeTest.cs index ed40f8af..322c6673 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/DateTimeTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/DateTimeTest.cs @@ -70,6 +70,9 @@ namespace FreeSql.Tests.MySqlConnectorExpression Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH"))); Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd"))); Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM"))); + Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss"))); + Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm"))); + Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH"))); Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd"))); Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM"))); Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy"))); diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/DateTimeTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/DateTimeTest.cs index a8b1bdc7..3962227a 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/DateTimeTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/DateTimeTest.cs @@ -70,6 +70,9 @@ namespace FreeSql.Tests.Odbc.MySqlExpression Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH"))); Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd"))); Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM"))); + Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss"))); + Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm"))); + Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH"))); Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd"))); Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM"))); Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy"))); diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/DateTimeTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/DateTimeTest.cs index 7fca1664..201947fa 100644 --- a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/DateTimeTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/DateTimeTest.cs @@ -70,6 +70,9 @@ namespace FreeSql.Tests.MySqlExpression Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH"))); Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd"))); Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM"))); + Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss"))); + Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm"))); + Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH"))); Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd"))); Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM"))); Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy"))); diff --git a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs index 7de21a0a..814d733b 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs @@ -402,6 +402,9 @@ namespace FreeSql.MySql case "'yyyy-MM-dd HH'": return $"date_format({left}, '%Y-%m-%d %H')"; case "'yyyy-MM-dd'": return $"date_format({left}, '%Y-%m-%d')"; case "'yyyy-MM'": return $"date_format({left}, '%Y-%m')"; + case "'yyyyMMddHHmmss'": return $"date_format({left}, '%Y%m%d%H%i%s')"; + case "'yyyyMMddHHmm'": return $"date_format({left}, '%Y%m%d%H%i')"; + case "'yyyyMMddHH'": return $"date_format({left}, '%Y%m%d%H')"; case "'yyyyMMdd'": return $"date_format({left}, '%Y%m%d')"; case "'yyyyMM'": return $"date_format({left}, '%Y%m')"; case "'yyyy'": return $"date_format({left}, '%Y')"; diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs index 3c55b3ea..feaa5ca4 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs @@ -402,6 +402,9 @@ namespace FreeSql.Odbc.MySql case "'yyyy-MM-dd HH'": return $"date_format({left}, '%Y-%m-%d %H')"; case "'yyyy-MM-dd'": return $"date_format({left}, '%Y-%m-%d')"; case "'yyyy-MM'": return $"date_format({left}, '%Y-%m')"; + case "'yyyyMMddHHmmss'": return $"date_format({left}, '%Y%m%d%H%i%s')"; + case "'yyyyMMddHHmm'": return $"date_format({left}, '%Y%m%d%H%i')"; + case "'yyyyMMddHH'": return $"date_format({left}, '%Y%m%d%H')"; case "'yyyyMMdd'": return $"date_format({left}, '%Y%m%d')"; case "'yyyyMM'": return $"date_format({left}, '%Y%m')"; case "'yyyy'": return $"date_format({left}, '%Y')";