From 69839073029f6eafbc4689af4e9c180a568c5972 Mon Sep 17 00:00:00 2001 From: zqlovejyc <943620963@qq.com> Date: Sat, 14 May 2022 08:45:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=832.3.4=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQLBuilder.Diagnostics/Properties/AssemblyInfo.cs | 4 ++-- SQLBuilder/Expressions/MemberExpressionResolver.cs | 14 +++++++------- SQLBuilder/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SQLBuilder.Diagnostics/Properties/AssemblyInfo.cs b/SQLBuilder.Diagnostics/Properties/AssemblyInfo.cs index 4bbaaf4..248d017 100644 --- a/SQLBuilder.Diagnostics/Properties/AssemblyInfo.cs +++ b/SQLBuilder.Diagnostics/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.3.0")] -[assembly: AssemblyFileVersion("2.3.3.0")] +[assembly: AssemblyVersion("2.3.4.0")] +[assembly: AssemblyFileVersion("2.3.4.0")] diff --git a/SQLBuilder/Expressions/MemberExpressionResolver.cs b/SQLBuilder/Expressions/MemberExpressionResolver.cs index 0fe4359..139ca79 100644 --- a/SQLBuilder/Expressions/MemberExpressionResolver.cs +++ b/SQLBuilder/Expressions/MemberExpressionResolver.cs @@ -381,8 +381,8 @@ public override SqlWrapper Where(MemberExpression expression, SqlWrapper sqlWrap { if (new HashSet { - DatabaseType.PostgreSql, - DatabaseType.MySql + DatabaseType.MySql, + DatabaseType.PostgreSql }.Contains(sqlWrapper.DatabaseType)) sqlWrapper += " IS TRUE"; else @@ -519,8 +519,8 @@ public override SqlWrapper Having(MemberExpression expression, SqlWrapper sqlWra { if (new HashSet { - DatabaseType.PostgreSql, - DatabaseType.MySql + DatabaseType.MySql, + DatabaseType.PostgreSql }.Contains(sqlWrapper.DatabaseType)) sqlWrapper += " IS TRUE"; else @@ -568,7 +568,7 @@ public override SqlWrapper OrderBy(MemberExpression expression, SqlWrapper sqlWr { sqlWrapper += tableAlias + sqlWrapper.GetColumnInfo(expression.Member.DeclaringType, expression.Member).ColumnName; if (orders?.Length > 0) - sqlWrapper += $" { (orders[0] == OrderType.Descending ? "DESC" : "ASC")}"; + sqlWrapper += $" {(orders[0] == OrderType.Descending ? "DESC" : "ASC")}"; } if (expression.Expression.NodeType == ExpressionType.Constant || @@ -586,7 +586,7 @@ public override SqlWrapper OrderBy(MemberExpression expression, SqlWrapper sqlWr SqlExpressionProvider.OrderBy(Expression.Constant(item), sqlWrapper); if (i <= orders.Length - 1) - sqlWrapper += $" { (orders[i] == OrderType.Descending ? "DESC" : "ASC")},"; + sqlWrapper += $" {(orders[i] == OrderType.Descending ? "DESC" : "ASC")},"; else if (item.ToString().ContainsIgnoreCase("ASC", "DESC") == false) sqlWrapper += " ASC,"; else @@ -605,7 +605,7 @@ public override SqlWrapper OrderBy(MemberExpression expression, SqlWrapper sqlWr if (!str.ContainsIgnoreCase("ASC", "DESC")) { if (orders.Length >= 1) - sqlWrapper += $" { (orders[0] == OrderType.Descending ? "DESC" : "ASC")},"; + sqlWrapper += $" {(orders[0] == OrderType.Descending ? "DESC" : "ASC")},"; else sqlWrapper += " ASC,"; diff --git a/SQLBuilder/Properties/AssemblyInfo.cs b/SQLBuilder/Properties/AssemblyInfo.cs index 0d129f7..96b6095 100644 --- a/SQLBuilder/Properties/AssemblyInfo.cs +++ b/SQLBuilder/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.3.0")] -[assembly: AssemblyFileVersion("2.3.3.0")] +[assembly: AssemblyVersion("2.3.4.0")] +[assembly: AssemblyFileVersion("2.3.4.0")]