From 81ba893f6e572f9a3fdb6c37b8c3a7503cb7480c Mon Sep 17 00:00:00 2001 From: "tao@r5" Date: Mon, 8 Aug 2022 08:46:45 +0800 Subject: [PATCH] .. --- src/NSExt/ByteExtensions.cs | 2 +- src/NSExt/DateTimeExtensions.cs | 2 +- src/NSExt/DbCommandExtensions.cs | 38 +++++++++++++++++++++++++++++++ src/NSExt/DecimalExtensions.cs | 2 +- src/NSExt/EnumExtensions.cs | 2 +- src/NSExt/EnumerableExtensions.cs | 2 +- src/NSExt/GenericExtensions.cs | 2 +- src/NSExt/IntExtensions.cs | 2 +- src/NSExt/LoggerExtensions.cs | 4 ++-- src/NSExt/LongExtensions.cs | 2 +- src/NSExt/ObjectExtensions.cs | 2 +- src/NSExt/StringExtensions.cs | 2 +- src/NSExt/UriExtensions.cs | 2 +- 13 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 src/NSExt/DbCommandExtensions.cs diff --git a/src/NSExt/ByteExtensions.cs b/src/NSExt/ByteExtensions.cs index d154ffe..592dbaf 100644 --- a/src/NSExt/ByteExtensions.cs +++ b/src/NSExt/ByteExtensions.cs @@ -2,7 +2,7 @@ // @file: ByteExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 using System.Text; diff --git a/src/NSExt/DateTimeExtensions.cs b/src/NSExt/DateTimeExtensions.cs index bb40609..edef15f 100644 --- a/src/NSExt/DateTimeExtensions.cs +++ b/src/NSExt/DateTimeExtensions.cs @@ -2,7 +2,7 @@ // @file: DateTimeExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 // ReSharper disable UnusedMember.Global diff --git a/src/NSExt/DbCommandExtensions.cs b/src/NSExt/DbCommandExtensions.cs new file mode 100644 index 0000000..7407223 --- /dev/null +++ b/src/NSExt/DbCommandExtensions.cs @@ -0,0 +1,38 @@ +// @program: NSExt +// @file: DbCommandExtensions.cs +// @author: tao ke +// @mailto: taokeu@gmail.com +// @created: 08/06/2022 19:48 + +using System.Data; +using System.Data.Common; + +namespace NSExt; + +public static class DbCommandExtensions +{ + /// + /// 格式化参数拼接成完整的SQL语句 + /// + /// + public static string ParameterFormat(this DbCommand me) + { + //var aa = pars.ToDictionary(it => it.ParameterName, it => it.Value); + var sql = me.CommandText; + + //应逆向替换，否则由于 多个表的过滤器问题导致替换不完整 如 @TenantId1 @TenantId10 + for (var i = me.Parameters.Count - 1; i >= 0; i--) + sql = me.Parameters[i].DbType switch { + DbType.String or DbType.DateTime or DbType.Date or DbType.Time or DbType.DateTime2 + or DbType.DateTimeOffset or DbType.Guid or DbType.VarNumeric or DbType.AnsiStringFixedLength + or DbType.AnsiString + or DbType.StringFixedLength => sql.Replace(me.Parameters[i].ParameterName, + "'" + me.Parameters[i].Value + "'"), + DbType.Boolean => sql.Replace(me.Parameters[i].ParameterName, + Convert.ToBoolean(me.Parameters[i].Value) ? "1" : "0"), + _ => sql.Replace(me.Parameters[i].ParameterName, me.Parameters[i].Value?.ToString()) + }; + + return sql; + } +} diff --git a/src/NSExt/DecimalExtensions.cs b/src/NSExt/DecimalExtensions.cs index e1e17e1..8bef4ff 100644 --- a/src/NSExt/DecimalExtensions.cs +++ b/src/NSExt/DecimalExtensions.cs @@ -2,7 +2,7 @@ // @file: DecimalExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 namespace NSExt; diff --git a/src/NSExt/EnumExtensions.cs b/src/NSExt/EnumExtensions.cs index 0905ba3..bf689af 100644 --- a/src/NSExt/EnumExtensions.cs +++ b/src/NSExt/EnumExtensions.cs @@ -2,7 +2,7 @@ // @file: EnumExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 using System.ComponentModel; diff --git a/src/NSExt/EnumerableExtensions.cs b/src/NSExt/EnumerableExtensions.cs index 15c1d3f..bbc00a2 100644 --- a/src/NSExt/EnumerableExtensions.cs +++ b/src/NSExt/EnumerableExtensions.cs @@ -2,7 +2,7 @@ // @file: EnumerableExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 namespace NSExt; diff --git a/src/NSExt/GenericExtensions.cs b/src/NSExt/GenericExtensions.cs index 7005ab9..8bda3c7 100644 --- a/src/NSExt/GenericExtensions.cs +++ b/src/NSExt/GenericExtensions.cs @@ -2,7 +2,7 @@ // @file: GenericExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 namespace NSExt; diff --git a/src/NSExt/IntExtensions.cs b/src/NSExt/IntExtensions.cs index f1636c9..2a4cbc2 100644 --- a/src/NSExt/IntExtensions.cs +++ b/src/NSExt/IntExtensions.cs @@ -2,7 +2,7 @@ // @file: IntExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 namespace NSExt; diff --git a/src/NSExt/LoggerExtensions.cs b/src/NSExt/LoggerExtensions.cs index 6a7021d..b63489a 100644 --- a/src/NSExt/LoggerExtensions.cs +++ b/src/NSExt/LoggerExtensions.cs @@ -2,7 +2,7 @@ // @file: LoggerExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 using System.Runtime.CompilerServices; using Microsoft.Extensions.Logging; @@ -19,7 +19,7 @@ public static class LoggerExtensions int callerLineNumber) { return - $"[{Thread.CurrentThread.ManagedThreadId}#{callerName}@{Path.GetFileName(callerFilePath)}:{callerLineNumber}] {message}"; + $"{message} "; } public static void Debug(this ILogger me, diff --git a/src/NSExt/LongExtensions.cs b/src/NSExt/LongExtensions.cs index 839e77a..7a6decf 100644 --- a/src/NSExt/LongExtensions.cs +++ b/src/NSExt/LongExtensions.cs @@ -2,7 +2,7 @@ // @file: LongExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 namespace NSExt; diff --git a/src/NSExt/ObjectExtensions.cs b/src/NSExt/ObjectExtensions.cs index e672fe1..5bed4e4 100644 --- a/src/NSExt/ObjectExtensions.cs +++ b/src/NSExt/ObjectExtensions.cs @@ -2,7 +2,7 @@ // @file: ObjectExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 using Newtonsoft.Json; diff --git a/src/NSExt/StringExtensions.cs b/src/NSExt/StringExtensions.cs index 2dc89cf..ce8b0a2 100644 --- a/src/NSExt/StringExtensions.cs +++ b/src/NSExt/StringExtensions.cs @@ -2,7 +2,7 @@ // @file: StringExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 using System.Globalization; using System.Text; diff --git a/src/NSExt/UriExtensions.cs b/src/NSExt/UriExtensions.cs index 9ab6297..611870b 100644 --- a/src/NSExt/UriExtensions.cs +++ b/src/NSExt/UriExtensions.cs @@ -2,7 +2,7 @@ // @file: UriExtensions.cs // @author: tao ke // @mailto: taokeu@gmail.com -// @created: 07/15/2022 20:36 +// @created: 07/26/2022 21:57 namespace NSExt;