Skip to content

Commit 5b03aa6

Browse files
fredericDelaportefredericDelaporte
committed
Merge branch '5.2.x'
# Conflicts: # Tools/packages.config # src/NHibernate.Test/SystemTransactions/SystemTransactionFixture.cs # src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs # src/NHibernate/Async/Cache/NonstrictReadWriteCache.cs # src/NHibernate/Async/Cache/ReadOnlyCache.cs # src/NHibernate/Async/Cache/StandardQueryCache.cs # src/NHibernate/Async/Multi/QueryBatchItemBase.cs # src/NHibernate/Cache/NonstrictReadWriteCache.cs # src/NHibernate/Cache/ReadOnlyCache.cs # src/NHibernate/Cache/StandardQueryCache.cs # src/NHibernate/Loader/JoinWalker.cs # src/NHibernate/Loader/Loader.cs # src/NHibernate/Multi/QueryBatchItemBase.cs
2 parents 94a94da + f7b64c5 commit 5b03aa6

File tree

61 files changed

+2585
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2585
-288
lines changed

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 5.2.5.{build}
1+
version: 5.2.6.{build}
22
image: Visual Studio 2017
33
environment:
44
matrix:

‎build-common/NHibernate.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
77
<VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
8-
<VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
8+
<VersionPatch Condition="'$(VersionPatch)' == ''">6</VersionPatch>
99
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
1010

1111
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

‎build-common/common.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

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

1919
<!-- properties used to connect to database for testing -->
2020
<include buildfile="nhibernate-properties.xml" />

‎doc/reference/modules/configuration.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,20 @@ in the parameter binding.</programlisting>
11001100
</para>
11011101
</entry>
11021102
</row>
1103+
<row>
1104+
<entry>
1105+
<literal>sqlite.binaryguid</literal>
1106+
</entry>
1107+
<entry>
1108+
SQLite can store GUIDs in binary or text form, controlled by the BinaryGuid
1109+
connection string parameter (default is 'true'). The BinaryGuid setting will affect
1110+
how to cast GUID to string in SQL. NHibernate will attempt to detect this
1111+
setting automatically from the connection string, but if the connection
1112+
or connection string is being handled by the application instead of by NHibernate,
1113+
you can use the <literal>sqlite.binaryguid</literal> NHibernate setting to override the behavior.
1114+
The value can be <literal>true</literal> or <literal>false</literal>.
1115+
</entry>
1116+
</row>
11031117
<row>
11041118
<entry>
11051119
<literal>nhibernate-logger</literal>

‎releasenotes.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
Build 5.2.6
2+
=============================
3+
4+
Release notes - NHibernate - Version 5.2.6
5+
6+
11 issues were resolved in this release.
7+
8+
** Bug
9+
10+
* #2190 Cannot instantiate a SessionFactory using Prevalence cache
11+
* #2177 New Fetch() method in QueryOver returns IQueryOver<> instead of QueryOver<>
12+
* #2172 Using DependentTransaction fails
13+
* #2175 Subcriteria on component collection generates incorrect join alias
14+
* #2173 Futures not batching correctly in NH 5.2.x
15+
* #2141 Undefined call to Equals object in collection during flush just before commit
16+
* #2127 StackExchangeRedisCache with PreferMultipleGet = true calls GetMany multiple times
17+
* #2110 Wrong GUID to string conversion with SQLite BinaryGuid=False
18+
19+
** Task
20+
21+
* #2200 Release 5.2.6
22+
* #2199 Upgrade AsyncGenerator to 0.8.2.12
23+
24+
** Tests
25+
26+
* #2132 Add GetMany for ReadWriteCache tests
27+
128
Build 5.2.5
229
=============================
330

‎src/AsyncGenerator.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
- pattern: ^.*(Hql\.g).*$
88
analyzation:
99
methodConversion:
10+
#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults
11+
- conversion: Ignore
12+
name: ProcessResults
13+
containingTypeName: IQueryBatchItem
1014
- conversion: Ignore
1115
name: PostProcessInsert
1216
containingTypeName: HqlSqlWalker
@@ -185,6 +189,18 @@
185189
- pattern: ^.*(Hql\.g).*$
186190
analyzation:
187191
methodConversion:
192+
- conversion: Ignore
193+
name: CanUseDependentTransaction
194+
containingTypeName: DistributedSystemTransactionFixture
195+
- conversion: Ignore
196+
name: CanUseSessionWithManyDependentTransaction
197+
containingTypeName: DistributedSystemTransactionFixture
198+
- conversion: Ignore
199+
name: CanUseDependentTransaction
200+
containingTypeName: SystemTransactionFixture
201+
- conversion: Ignore
202+
name: CanUseSessionWithManyDependentTransaction
203+
containingTypeName: SystemTransactionFixture
188204
- conversion: Copy
189205
name: AfterTransactionCompletionProcess_EvictsFromCache
190206
asyncExtensionMethods:

0 commit comments

Comments
 (0)