发布2.3.7版本；

zqlovejyc · May 14, 2022 · 6a13075 · 6a13075
1 parent 3ea023c
commit 6a13075
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git a/SQLBuilder.Core.Console/SQLBuilder.Core.Console.csproj b/SQLBuilder.Core.Console/SQLBuilder.Core.Console.csproj
@@ -16,7 +16,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.24" />
+ <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.25" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/SQLBuilder.Core.Diagnostics/SQLBuilder.Core.Diagnostics.csproj b/SQLBuilder.Core.Diagnostics/SQLBuilder.Core.Diagnostics.csproj
@@ -21,9 +21,9 @@
  <PackageReleaseNotes>1.升级SQLBuilder引用版本；</PackageReleaseNotes>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
  <PackageId>Zq.SQLBuilder.Core.Diagnostics</PackageId>
- <Version>2.3.6</Version>
- <FileVersion>2.3.6.0</FileVersion>
- <AssemblyVersion>2.3.6.0</AssemblyVersion>
+ <Version>2.3.7</Version>
+ <FileVersion>2.3.7.0</FileVersion>
+ <AssemblyVersion>2.3.7.0</AssemblyVersion>
  <LangVersion>latest</LangVersion>
  </PropertyGroup>
 
@@ -45,7 +45,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.24" />
+ <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.25" />
  <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">

diff --git a/SQLBuilder.Core.ElasticApm/SQLBuilder.Core.ElasticApm.csproj b/SQLBuilder.Core.ElasticApm/SQLBuilder.Core.ElasticApm.csproj
@@ -20,9 +20,9 @@
  <PackageTags>sqlbuilder;elastic;apm</PackageTags>
  <PackageReleaseNotes>1.升级SQLBuilder引用版本；</PackageReleaseNotes>
  <PackageId>Zq.SQLBuilder.Core.ElasticApm</PackageId>
- <Version>2.3.6</Version>
- <FileVersion>2.3.6.0</FileVersion>
- <AssemblyVersion>2.3.6.0</AssemblyVersion>
+ <Version>2.3.7</Version>
+ <FileVersion>2.3.7.0</FileVersion>
+ <AssemblyVersion>2.3.7.0</AssemblyVersion>
  <LangVersion>latest</LangVersion>
  </PropertyGroup>
 
@@ -33,8 +33,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Elastic.Apm.AspNetCore" Version="1.14.1" />
- <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.24" />
+ <PackageReference Include="Elastic.Apm.AspNetCore" Version="1.15.0" />
+ <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.25" />
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/SQLBuilder.Core.SkyWalking/SQLBuilder.Core.SkyWalking.csproj b/SQLBuilder.Core.SkyWalking/SQLBuilder.Core.SkyWalking.csproj
@@ -21,9 +21,9 @@
  <PackageReleaseNotes>1.升级SQLBuilder引用版本；</PackageReleaseNotes>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
  <PackageId>Zq.SQLBuilder.Core.SkyWalking</PackageId>
- <Version>2.3.6</Version>
- <FileVersion>2.3.6.0</FileVersion>
- <AssemblyVersion>2.3.6.0</AssemblyVersion>
+ <Version>2.3.7</Version>
+ <FileVersion>2.3.7.0</FileVersion>
+ <AssemblyVersion>2.3.7.0</AssemblyVersion>
  <LangVersion>latest</LangVersion>
  </PropertyGroup>
 
@@ -52,4 +52,8 @@
  </PackageReference>
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
+ <PackageReference Include="SkyAPM.Utilities.DependencyInjection" Version="2.0.0" />
+ </ItemGroup>
+
 </Project>
diff --git a/SQLBuilder.Core.UnitTest/SQLBuilder.Core.UnitTest.csproj b/SQLBuilder.Core.UnitTest/SQLBuilder.Core.UnitTest.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git 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>
  {
- 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>
  {
- 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
@@ -8,17 +8,16 @@
  <EmbedUntrackedSources>true</EmbedUntrackedSources>
  <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
  <Authors>张强</Authors>
- <Version>2.3.6</Version>
- <FileVersion>2.3.6.0</FileVersion>
- <AssemblyVersion>2.3.6.0</AssemblyVersion>
+ <Version>2.3.7</Version>
+ <FileVersion>2.3.7.0</FileVersion>
+ <AssemblyVersion>2.3.7.0</AssemblyVersion>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Description>Expression表达式转换为SQL语句，支持SqlServer、MySql、Oracle、Sqlite、PostgreSql；基于Dapper实现了不同数据库对应的数据仓储Repository；</Description>
  <Copyright>Copyright © 2018-2025 , 张强 943620963@qq.com</Copyright>
  <PackageId>Zq.SQLBuilder.Core</PackageId>
- <PackageReleaseNotes>1.优化Substring扩展，添加comparisonType参数；
-2.重载Contains、ContainsIgnoreCase扩展方法，添加MatchType匹配类型参数；
-3.重载ToLambda扩展方法，优化ToObject扩展方法，修复Guid类型数据解析异常bug；
-4.升级nuget包；</PackageReleaseNotes>
+ <PackageReleaseNotes>1.修复数据库类型为PostgreSql时，解析bool类型条件时，解析为1的bug;
+2.优化Mysql数据库bool类型sql解析；
+3.升级nuget包；</PackageReleaseNotes>
  <PackageProjectUrl>https://github.com/zqlovejyc/SQLBuilder.Core</PackageProjectUrl>
  <PackageLicenseUrl></PackageLicenseUrl>
  <PackageIcon>sql.png</PackageIcon>
@@ -48,7 +47,7 @@
  <ItemGroup>
  <PackageReference Include="Dapper" Version="2.0.123" />
  <PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
- <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.4" />
+ <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
  <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />