Skip to content

Merge 5.2.6 #2205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 5.2.5.{build}
version: 5.2.6.{build}
image: Visual Studio 2017
environment:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion build-common/NHibernate.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
<VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
<VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
<VersionPatch Condition="'$(VersionPatch)' == ''">6</VersionPatch>
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>

<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
Expand Down
4 changes: 2 additions & 2 deletions build-common/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<!-- This is used only for build folder -->
<!-- TODO: Either remove or refactor to use NHibernate.props -->
<property name="project.version" value="5.2.5" overwrite="false" />
<property name="project.version.numeric" value="5.2.5" overwrite="false" />
<property name="project.version" value="5.2.6" overwrite="false" />
<property name="project.version.numeric" value="5.2.6" overwrite="false" />

<!-- properties used to connect to database for testing -->
<include buildfile="nhibernate-properties.xml" />
Expand Down
14 changes: 14 additions & 0 deletions doc/reference/modules/configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1100,6 +1100,20 @@ in the parameter binding.</programlisting>
</para>
</entry>
</row>
<row>
<entry>
<literal>sqlite.binaryguid</literal>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new setting lacks its declaration in nhibernate-configuration.xsd file. Thus, it cannot be used in configuration files, and can only be used programmatically. Fixing this is just one line to add into nhibernate-configuration.xsd.
Ideally, it should be done on 5.2.x. But I do not think it deserves a release on its own. So I propose to handle it with a PR targeting master, and waiting for 5.3. If we have a 5.2.x to do for some other reasons before, we could then retarget 5.2x. Otherwise just fix it for 5.3. @oskarb

</entry>
<entry>
SQLite can store GUIDs in binary or text form, controlled by the BinaryGuid
connection string parameter (default is 'true'). The BinaryGuid setting will affect
how to cast GUID to string in SQL. NHibernate will attempt to detect this
setting automatically from the connection string, but if the connection
or connection string is being handled by the application instead of by NHibernate,
you can use the <literal>sqlite.binaryguid</literal> NHibernate setting to override the behavior.
The value can be <literal>true</literal> or <literal>false</literal>.
</entry>
</row>
<row>
<entry>
<literal>nhibernate-logger</literal>
Expand Down
43 changes: 43 additions & 0 deletions releasenotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
Build 5.2.6
=============================

Release notes - NHibernate - Version 5.2.6

11 issues were resolved in this release.

** Bug

* #2190 Cannot instantiate a SessionFactory using Prevalence cache
* #2177 New Fetch() method in QueryOver returns IQueryOver<> instead of QueryOver<>
* #2172 Using DependentTransaction fails
* #2175 Subcriteria on component collection generates incorrect join alias
* #2173 Futures not batching correctly in NH 5.2.x
* #2141 Undefined call to Equals object in collection during flush just before commit
* #2127 StackExchangeRedisCache with PreferMultipleGet = true calls GetMany multiple times
* #2110 Wrong GUID to string conversion with SQLite BinaryGuid=False

** Task

* #2200 Release 5.2.6
* #2199 Upgrade AsyncGenerator to 0.8.2.12

** Tests

* #2132 Add GetMany for ReadWriteCache tests

Build 5.2.5
=============================

Expand Down Expand Up @@ -342,6 +369,14 @@ Release notes - NHibernate - Version 5.2.0
As part of releasing 5.2.0, a misnamed setting in 5.0.0 release notes has been fixed:
transaction.use_connection_on_system_events correct name is transaction.use_connection_on_system_prepare

Build 5.1.6
=============================

Release notes - NHibernate - Version 5.1.6

** Bug
* #2172 Using DependentTransaction fails

Build 5.1.5
=============================

Expand Down Expand Up @@ -605,6 +640,14 @@ Release notes - NHibernate - Version 5.1.0
As part of releasing 5.1.0, a missing 5.0.0 possible breaking change has been added about inequality semantic in LINQ
queries. See 5.0.0 possible breaking changes.

Build 5.0.8
=============================

Release notes - NHibernate - Version 5.0.8

** Bug
* #2172 Using DependentTransaction fails

Build 5.0.7
=============================

Expand Down
16 changes: 16 additions & 0 deletions src/AsyncGenerator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
- pattern: ^.*(Hql\.g).*$
analyzation:
methodConversion:
#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults
- conversion: Ignore
name: ProcessResults
containingTypeName: IQueryBatchItem
- conversion: Ignore
name: PostProcessInsert
containingTypeName: HqlSqlWalker
Expand Down Expand Up @@ -185,6 +189,18 @@
- pattern: ^.*(Hql\.g).*$
analyzation:
methodConversion:
- conversion: Ignore
name: CanUseDependentTransaction
containingTypeName: DistributedSystemTransactionFixture
- conversion: Ignore
name: CanUseSessionWithManyDependentTransaction
containingTypeName: DistributedSystemTransactionFixture
- conversion: Ignore
name: CanUseDependentTransaction
containingTypeName: SystemTransactionFixture
- conversion: Ignore
name: CanUseSessionWithManyDependentTransaction
containingTypeName: SystemTransactionFixture
- conversion: Copy
name: AfterTransactionCompletionProcess_EvictsFromCache
asyncExtensionMethods:
Expand Down
Loading