From ffc6831bbd2db5617552b221ad0380b141fdc87e Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Thu, 8 Aug 2024 20:42:56 +0800 Subject: [PATCH] - continue --- .../FreeSql.Provider.ClickHouse/ClickHouseUtils.cs | 7 +------ .../MySql/CustomMySqlUtils.cs | 5 ----- .../PostgreSQL/CustomPostgreSQLUtils.cs | 7 +------ .../SqlServer/CustomSqlServerUtils.cs | 5 ----- Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs | 5 ----- Providers/FreeSql.Provider.GBase/GBaseUtils.cs | 5 ----- .../FreeSql.Provider.KingbaseES/KingbaseESUtils.cs | 7 +------ Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs | 5 ----- Providers/FreeSql.Provider.MySql/MySqlUtils.cs | 5 ----- .../KingbaseES/OdbcKingbaseESUtils.cs | 7 +------ .../FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs | 5 ----- .../PostgreSQL/OdbcPostgreSQLUtils.cs | 7 +------ .../SqlServer/OdbcSqlServerUtils.cs | 5 ----- .../FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs | 7 +------ Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs | 9 +-------- .../FreeSql.Provider.SqlServer/SqlServerUtils.cs | 12 ------------ Providers/FreeSql.Provider.Xugu/XuguUtils.cs | 7 +------ 17 files changed, 8 insertions(+), 102 deletions(-) diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs index 0061b284..9948e9a5 100644 --- a/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs +++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs @@ -153,12 +153,7 @@ namespace FreeSql.ClickHouse if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{Math.Floor(ts.TotalHours)}:{ts.Minutes}:{ts.Seconds}"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type.GetElementType(); diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs index 82db8cfc..f428e94c 100644 --- a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs +++ b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlUtils.cs @@ -102,11 +102,6 @@ namespace FreeSql.Custom.MySql if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{Math.Floor(ts.TotalHours)}:{ts.Minutes}:{ts.Seconds}"; - } return FormatSql("{0}", value, 1); } } diff --git a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs index e59fd9e8..59b0b872 100644 --- a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs +++ b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLUtils.cs @@ -136,12 +136,7 @@ namespace FreeSql.Custom.PostgreSQL value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"'\\x{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"'{Math.Min(24, (int)Math.Floor(ts.TotalHours))}:{ts.Minutes}:{ts.Seconds}'"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type2.GetElementType(); diff --git a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs index 9bb034d7..4e93c3fa 100644 --- a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs +++ b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerUtils.cs @@ -98,11 +98,6 @@ namespace FreeSql.Custom.SqlServer if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}"; - } return string.Format(CultureInfo.InvariantCulture, "{0}", (_orm.Ado as AdoProvider).AddslashesProcessParam(value, type, col)); } } diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs b/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs index ba07d24d..e9162b89 100644 --- a/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs +++ b/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs @@ -89,11 +89,6 @@ namespace FreeSql.Firebird if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"x'{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{Math.Floor(ts.TotalHours)}:{ts.Minutes}:{ts.Seconds}"; - } return FormatSql("{0}", value, 1); } } diff --git a/Providers/FreeSql.Provider.GBase/GBaseUtils.cs b/Providers/FreeSql.Provider.GBase/GBaseUtils.cs index bb31c7e5..a92c0aba 100644 --- a/Providers/FreeSql.Provider.GBase/GBaseUtils.cs +++ b/Providers/FreeSql.Provider.GBase/GBaseUtils.cs @@ -95,11 +95,6 @@ namespace FreeSql.GBase var pam = AppendParamter(specialParams, "", null, type, value); return pam.ParameterName; } - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"interval({ts.Days} {ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}) day(9) to fraction"; - } if (type == typeof(DateTime)) { if (Utils.TypeHandlers.TryGetValue(typeof(DateTime), out var typeHandler)) return FormatSql("{0}", typeHandler.Serialize(value), 1); diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs index 3dba7e74..cb9eaf0a 100644 --- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs +++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESUtils.cs @@ -131,12 +131,7 @@ namespace FreeSql.KingbaseES value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"'\\x{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"'{Math.Min(24, (int)Math.Floor(ts.TotalHours))}:{ts.Minutes}:{ts.Seconds}'"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type2.GetElementType(); diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs index bdb5046e..53ce8c7a 100644 --- a/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs +++ b/Providers/FreeSql.Provider.MsAccess/MsAccessUtils.cs @@ -87,11 +87,6 @@ namespace FreeSql.MsAccess if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{ts.Hours}:{ts.Minutes}:{ts.Seconds}"; - } return FormatSql("{0}", value, 1); } diff --git a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs index a1622cc6..b2ad83ad 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs @@ -134,11 +134,6 @@ namespace FreeSql.MySql if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{Math.Floor(ts.TotalHours)}:{ts.Minutes}:{ts.Seconds}"; - } return FormatSql("{0}", value, 1); } } diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs index 536b8b80..84374921 100644 --- a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESUtils.cs @@ -130,12 +130,7 @@ namespace FreeSql.Odbc.KingbaseES value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"'\\x{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"'{Math.Min(24, (int)Math.Floor(ts.TotalHours))}:{ts.Minutes}:{ts.Seconds}'"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type2.GetElementType(); diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs index d78f43ea..ed192244 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlUtils.cs @@ -98,11 +98,6 @@ namespace FreeSql.Odbc.MySql if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{Math.Floor(ts.TotalHours)}:{ts.Minutes}:{ts.Seconds}"; - } return FormatSql("{0}", value, 1); } } diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs index e9b463b6..bdee29da 100644 --- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLUtils.cs @@ -130,12 +130,7 @@ namespace FreeSql.Odbc.PostgreSQL value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"'\\x{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"'{Math.Min(24, (int)Math.Floor(ts.TotalHours))}:{ts.Minutes}:{ts.Seconds}'"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type2.GetElementType(); diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs index 8513e0b2..e679163c 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerUtils.cs @@ -92,11 +92,6 @@ namespace FreeSql.Odbc.SqlServer if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}"; - } return string.Format(CultureInfo.InvariantCulture, "{0}", (_orm.Ado as AdoProvider).AddslashesProcessParam(value, type, col)); } } diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs index 96ae3dfa..72bfd519 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs +++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLUtils.cs @@ -186,12 +186,7 @@ namespace FreeSql.PostgreSQL value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"'\\x{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"'{Math.Min(24, (int)Math.Floor(ts.TotalHours))}:{ts.Minutes}:{ts.Seconds}'"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type2.GetElementType(); diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs index 9e0db7e1..0363d495 100644 --- a/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs +++ b/Providers/FreeSql.Provider.ShenTong/ShenTongUtils.cs @@ -144,14 +144,7 @@ namespace FreeSql.ShenTong value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - var hh = Math.Min(24, (int)Math.Floor(ts.TotalHours)); - if (hh >= 24) hh = 0; - value = $"{hh}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}"; - } - else if (value is Array) + if (value is Array) { var valueArr = value as Array; var eleType = type2.GetElementType(); diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs index 987f0817..fee1d88c 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs @@ -108,18 +108,6 @@ namespace FreeSql.SqlServer if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}"; - if (type == typeof(TimeSpan) || type == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - value = $"{ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}"; - } -#if net60 - if (type == typeof(TimeOnly) || type == typeof(TimeOnly?)) - { - var ts = (TimeOnly)value; - value = $"{ts.Hour}:{ts.Minute}:{ts.Second}.{ts.Millisecond}"; - } -#endif return string.Format(CultureInfo.InvariantCulture, "{0}", (_orm.Ado as AdoProvider).AddslashesProcessParam(value, type, col)); } } diff --git a/Providers/FreeSql.Provider.Xugu/XuguUtils.cs b/Providers/FreeSql.Provider.Xugu/XuguUtils.cs index fc16dc15..57eefe68 100644 --- a/Providers/FreeSql.Provider.Xugu/XuguUtils.cs +++ b/Providers/FreeSql.Provider.Xugu/XuguUtils.cs @@ -149,12 +149,7 @@ namespace FreeSql.Xugu value = getParamterValue(type, value); var type2 = value.GetType(); if (type2 == typeof(byte[])) return $"'\\x{CommonUtils.BytesSqlRaw(value as byte[])}'"; - if (type2 == typeof(TimeSpan) || type2 == typeof(TimeSpan?)) - { - var ts = (TimeSpan)value; - return $"'{Math.Min(24, (int)Math.Floor(ts.TotalHours))}:{ts.Minutes}:{ts.Seconds}'"; - } - else if (dicGetParamterValue.ContainsKey(type2.FullName)) + if (dicGetParamterValue.ContainsKey(type2.FullName)) { value = string.Concat(value); }