发布2.3.1版本；

zqlovejyc · Dec 31, 2021 · 282cd7b · 282cd7b
1 parent 6e924aa
commit 282cd7b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
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.0</Version>
- <FileVersion>2.3.0.0</FileVersion>
- <AssemblyVersion>2.3.0.0</AssemblyVersion>
+ <Version>2.3.1</Version>
+ <FileVersion>2.3.1.0</FileVersion>
+ <AssemblyVersion>2.3.1.0</AssemblyVersion>
  <LangVersion>latest</LangVersion>
  </PropertyGroup>
 

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.0</Version>
- <FileVersion>2.3.0.0</FileVersion>
- <AssemblyVersion>2.3.0.0</AssemblyVersion>
+ <Version>2.3.1</Version>
+ <FileVersion>2.3.1.0</FileVersion>
+ <AssemblyVersion>2.3.1.0</AssemblyVersion>
  <LangVersion>latest</LangVersion>
  </PropertyGroup>
 

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.0</Version>
- <FileVersion>2.3.0.0</FileVersion>
- <AssemblyVersion>2.3.0.0</AssemblyVersion>
+ <Version>2.3.1</Version>
+ <FileVersion>2.3.1.0</FileVersion>
+ <AssemblyVersion>2.3.1.0</AssemblyVersion>
  <LangVersion>latest</LangVersion>
  </PropertyGroup>
 

diff --git a/SQLBuilder.Core/Entry/SqlBuilderCore.cs b/SQLBuilder.Core/Entry/SqlBuilderCore.cs
@@ -4549,6 +4549,7 @@ public SqlBuilderCore<T> OrderByDescending(Expression<Func<T, object>> expressio
  /// <param name="countSyntax">分页计数语法，默认COUNT(*)</param>
  /// <param name="serverVersion">DbConnection的ServerVersion属性</param>
  /// <returns>SqlBuilderCore</returns>
+ /// <remarks>注意：Oracle需要Split(';')分开单独查询总条数和分页数据</remarks>
  public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, string sql = null, Dictionary<string, object> parameters = null, string countSyntax = "COUNT(*)", string serverVersion = null)
  {
  var sb = new StringBuilder();
@@ -4623,6 +4624,7 @@ public SqlBuilderCore<T> Page(int pageSize, int pageIndex, string orderField, st
  /// <param name="countSyntax">分页计数语法，默认COUNT(*)</param>
  /// <param name="serverVersion">DbConnection的ServerVersion属性</param>
  /// <returns>SqlBuilderCore</returns>
+ /// <remarks>注意：Oracle需要Split(';')分开单独查询总条数和分页数据</remarks>
  public SqlBuilderCore<T> PageByWith(int pageSize, int pageIndex, string orderField, string sql = null, Dictionary<string, object> parameters = null, string countSyntax = "COUNT(*)", string serverVersion = null)
  {
  var sb = new StringBuilder();

diff --git a/SQLBuilder.Core/SQLBuilder.Core.csproj b/SQLBuilder.Core/SQLBuilder.Core.csproj
@@ -8,16 +8,14 @@
  <EmbedUntrackedSources>true</EmbedUntrackedSources>
  <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
  <Authors>张强</Authors>
- <Version>2.3.0</Version>
- <FileVersion>2.3.0.0</FileVersion>
- <AssemblyVersion>2.3.0.0</AssemblyVersion>
+ <Version>2.3.1</Version>
+ <FileVersion>2.3.1.0</FileVersion>
+ <AssemblyVersion>2.3.1.0</AssemblyVersion>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Description>Expression表达式转换为SQL语句，支持SqlServer、MySql、Oracle、Sqlite、PostgreSql；基于Dapper实现了不同数据库对应的数据仓储Repository；</Description>
  <Copyright>Copyright © 2018-2022 , 张强 943620963@qq.com</Copyright>
  <PackageId>Zq.SQLBuilder.Core</PackageId>
- <PackageReleaseNotes>1.优化OracleRepository支持Oracle12c及以上版本最新FETCH NEXT分页语法；
-2.统一仓储分页语法OrderField位置，修复部分情况下分页必须查询出排序字段的bug；
-3.注意MySql、PostgreSql、Sqlite、SqlServer分页排序逻辑已修改，修复排序字段必须在查询结果中的bug，需注意多表连接查询分页时，必要时需指明排序字段的表别名；</PackageReleaseNotes>
+ <PackageReleaseNotes>1.优化SqlBuilderCore的Page方法排序逻辑；</PackageReleaseNotes>
  <PackageProjectUrl>https://github.com/zqlovejyc/SQLBuilder.Core</PackageProjectUrl>
  <PackageLicenseUrl></PackageLicenseUrl>
  <PackageIcon>sql.png</PackageIcon>