From 6a130753a7594b455610b7a88f7333f2569d6af7 Mon Sep 17 00:00:00 2001 From: zqlovejyc <943620963@qq.com> Date: Sat, 14 May 2022 08:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=832.3.7=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.Core.Console.csproj | 2 +- .../SQLBuilder.Core.Diagnostics.csproj | 8 ++++---- .../SQLBuilder.Core.ElasticApm.csproj | 10 +++++----- .../SQLBuilder.Core.SkyWalking.csproj | 10 +++++++--- .../SQLBuilder.Core.UnitTest.csproj | 2 +- .../Expressions/MemberExpressionResolver.cs | 8 ++++---- SQLBuilder.Core/SQLBuilder.Core.csproj | 15 +++++++-------- 7 files changed, 29 insertions(+), 26 deletions(-) diff --git a/SQLBuilder.Core.Console/SQLBuilder.Core.Console.csproj b/SQLBuilder.Core.Console/SQLBuilder.Core.Console.csproj index 61537b1..473c7d5 100644 --- a/SQLBuilder.Core.Console/SQLBuilder.Core.Console.csproj +++ b/SQLBuilder.Core.Console/SQLBuilder.Core.Console.csproj @@ -16,7 +16,7 @@ - + diff --git a/SQLBuilder.Core.Diagnostics/SQLBuilder.Core.Diagnostics.csproj b/SQLBuilder.Core.Diagnostics/SQLBuilder.Core.Diagnostics.csproj index 57fedbc..d592673 100644 --- a/SQLBuilder.Core.Diagnostics/SQLBuilder.Core.Diagnostics.csproj +++ b/SQLBuilder.Core.Diagnostics/SQLBuilder.Core.Diagnostics.csproj @@ -21,9 +21,9 @@ 1.升级SQLBuilder引用版本; true Zq.SQLBuilder.Core.Diagnostics - 2.3.6 - 2.3.6.0 - 2.3.6.0 + 2.3.7 + 2.3.7.0 + 2.3.7.0 latest @@ -45,7 +45,7 @@ - + diff --git a/SQLBuilder.Core.ElasticApm/SQLBuilder.Core.ElasticApm.csproj b/SQLBuilder.Core.ElasticApm/SQLBuilder.Core.ElasticApm.csproj index 9d10b8b..653e8b7 100644 --- a/SQLBuilder.Core.ElasticApm/SQLBuilder.Core.ElasticApm.csproj +++ b/SQLBuilder.Core.ElasticApm/SQLBuilder.Core.ElasticApm.csproj @@ -20,9 +20,9 @@ sqlbuilder;elastic;apm 1.升级SQLBuilder引用版本; Zq.SQLBuilder.Core.ElasticApm - 2.3.6 - 2.3.6.0 - 2.3.6.0 + 2.3.7 + 2.3.7.0 + 2.3.7.0 latest @@ -33,8 +33,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SQLBuilder.Core.SkyWalking/SQLBuilder.Core.SkyWalking.csproj b/SQLBuilder.Core.SkyWalking/SQLBuilder.Core.SkyWalking.csproj index 7de7403..08954b0 100644 --- a/SQLBuilder.Core.SkyWalking/SQLBuilder.Core.SkyWalking.csproj +++ b/SQLBuilder.Core.SkyWalking/SQLBuilder.Core.SkyWalking.csproj @@ -21,9 +21,9 @@ 1.升级SQLBuilder引用版本; true Zq.SQLBuilder.Core.SkyWalking - 2.3.6 - 2.3.6.0 - 2.3.6.0 + 2.3.7 + 2.3.7.0 + 2.3.7.0 latest @@ -52,4 +52,8 @@ + + + + \ No newline at end of file diff --git a/SQLBuilder.Core.UnitTest/SQLBuilder.Core.UnitTest.csproj b/SQLBuilder.Core.UnitTest/SQLBuilder.Core.UnitTest.csproj index 3023f7d..98170aa 100644 --- a/SQLBuilder.Core.UnitTest/SQLBuilder.Core.UnitTest.csproj +++ b/SQLBuilder.Core.UnitTest/SQLBuilder.Core.UnitTest.csproj @@ -7,7 +7,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SQLBuilder.Core/Expressions/MemberExpressionResolver.cs b/SQLBuilder.Core/Expressions/MemberExpressionResolver.cs index 5713b3f..91eecb6 100644 --- a/SQLBuilder.Core/Expressions/MemberExpressionResolver.cs +++ b/SQLBuilder.Core/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 diff --git a/SQLBuilder.Core/SQLBuilder.Core.csproj b/SQLBuilder.Core/SQLBuilder.Core.csproj index 48b7af3..27bcf1a 100644 --- a/SQLBuilder.Core/SQLBuilder.Core.csproj +++ b/SQLBuilder.Core/SQLBuilder.Core.csproj @@ -8,17 +8,16 @@ true true 张强 - 2.3.6 - 2.3.6.0 - 2.3.6.0 + 2.3.7 + 2.3.7.0 + 2.3.7.0 true Expression表达式转换为SQL语句,支持SqlServer、MySql、Oracle、Sqlite、PostgreSql;基于Dapper实现了不同数据库对应的数据仓储Repository; Copyright © 2018-2025 , 张强 943620963@qq.com Zq.SQLBuilder.Core - 1.优化Substring扩展,添加comparisonType参数; -2.重载Contains、ContainsIgnoreCase扩展方法,添加MatchType匹配类型参数; -3.重载ToLambda扩展方法,优化ToObject扩展方法,修复Guid类型数据解析异常bug; -4.升级nuget包; + 1.修复数据库类型为PostgreSql时,解析bool类型条件时,解析为1的bug; +2.优化Mysql数据库bool类型sql解析; +3.升级nuget包; https://github.com/zqlovejyc/SQLBuilder.Core sql.png @@ -48,7 +47,7 @@ - +