Skip to content

Commit

Permalink
发布2.3.4版本;
Browse files Browse the repository at this point in the history
  • Loading branch information
zqlovejyc committed May 14, 2022
1 parent 3c1ec17 commit 6983907
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions SQLBuilder.Diagnostics/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
14 changes: 7 additions & 7 deletions SQLBuilder/Expressions/MemberExpressionResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ public override SqlWrapper Where(MemberExpression expression, SqlWrapper sqlWrap
{
if (new HashSet<DatabaseType>
{
DatabaseType.PostgreSql,
DatabaseType.MySql
DatabaseType.MySql,
DatabaseType.PostgreSql
}.Contains(sqlWrapper.DatabaseType))
sqlWrapper += " IS TRUE";
else
Expand Down Expand Up @@ -519,8 +519,8 @@ public override SqlWrapper Having(MemberExpression expression, SqlWrapper sqlWra
{
if (new HashSet<DatabaseType>
{
DatabaseType.PostgreSql,
DatabaseType.MySql
DatabaseType.MySql,
DatabaseType.PostgreSql
}.Contains(sqlWrapper.DatabaseType))
sqlWrapper += " IS TRUE";
else
Expand Down Expand Up @@ -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 ||
Expand All @@ -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
Expand All @@ -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,";

Expand Down
4 changes: 2 additions & 2 deletions SQLBuilder/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]

0 comments on commit 6983907

Please sign in to comment.