Skip to content

Commit b4b49c0

Browse files
maca88maca88
committed
Merge remote-tracking branch 'origin/master' into BatchableCache
2 parents a6955fc + 4dafb25 commit b4b49c0

File tree

249 files changed

+6318
-2395
lines changed

Some content is hidden

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

249 files changed

+6318
-2395
lines changed

‎ShowBuildMenu.bat

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,14 @@ echo E. Add a test configuration for Oracle.
5151
echo F. Add a test configuration for Oracle with managed driver.
5252
echo G. Add a test configuration for SQL Server Compact.
5353
echo H. Add a test configuration for MySql.
54+
echo I. Add a test configuration for SAP HANA.
5455
echo.
5556
echo X. Exit to main menu.
5657
echo.
5758

58-
%BUILDTOOL% prompt ABCDEFGHX
59-
if errorlevel 8 goto main-menu
59+
%BUILDTOOL% prompt ABCDEFGHIX
60+
if errorlevel 9 goto main-menu
61+
if errorlevel 8 goto test-setup-hana
6062
if errorlevel 7 goto test-setup-mysql
6163
if errorlevel 6 goto test-setup-sqlserverce
6264
if errorlevel 5 goto test-setup-oracle-managed
@@ -122,6 +124,13 @@ set LIB_FILES=
122124
set LIB_FILES2=
123125
goto test-setup-generic
124126

127+
:test-setup-hana
128+
set CONFIG_NAME=HANA
129+
set TEST_PLATFORM=AnyCPU
130+
set LIB_FILES=
131+
set LIB_FILES2=
132+
goto test-setup-generic
133+
125134
:test-setup-generic
126135
set CFGNAME=
127136
set /p CFGNAME=Enter a name for your test configuration or press enter to use default name:

‎Tools/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
88
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
99
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
10-
<package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.1" targetFramework="net461" />
10+
<package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.4" targetFramework="net461" />
1111
<package id="vswhere" version="2.1.4" targetFramework="net461" />
1212
<package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
1313
</packages>

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 5.1.1.{build}
1+
version: 5.1.2.{build}
22
image: Visual Studio 2017
33
environment:
44
matrix:
@@ -63,4 +63,4 @@ on_finish:
6363
$wc = New-Object 'System.Net.WebClient'
6464
Get-Item '*-TestResult.xml' | ForEach-Object {
6565
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", $_)
66-
}
66+
}

‎build-common/NHibernate.props

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

99
<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.1.1" overwrite="false" />
17-
<property name="project.version.numeric" value="5.1.1" overwrite="false" />
16+
<property name="project.version" value="5.1.2" overwrite="false" />
17+
<property name="project.version.numeric" value="5.1.2" overwrite="false" />
1818

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

‎releasenotes.txt

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
Build 5.1.1
1+
Build 5.1.2
2+
=============================
3+
4+
Release notes - NHibernate - Version 5.1.2
5+
6+
** Bug
7+
8+
* #1680 RowCount not working with JoinEntityAlias
9+
* #1672 Generated async methods do not correctly propagate OperationCanceledException
10+
* #1667 Collection initializing with zero rows after update to NH5
11+
* #1660 Wrong CopyTo implementation
12+
* #1650 Cannot use cache.use_sliding_expiration in hibernate.cfg.xml
13+
* #1585 Hashset unsupported by SetParameterList
14+
* #1355 NH-3928 - Random invalid SQL generated when using bitwise operators
15+
16+
** Task
17+
18+
* #1668 Merge 5.0.5 into 5.1.x
19+
* #1664 Release 5.1.2
20+
* #1659 Merge 5.0.4 into 5.1.x
21+
22+
As part of releasing 5.1.2, a missing 5.0.0 possible breaking change has been added about future queries with data
23+
providers not actually supporting them. See 5.0.0 possible breaking changes.
24+
25+
26+
Build 5.1.1
227
=============================
328

429
Release notes - NHibernate - Version 5.1.1
@@ -192,6 +217,34 @@ Release notes - NHibernate - Version 5.1.0
192217
As part of releasing 5.1.0, a missing 5.0.0 possible breaking change has been added about inequality semantic in LINQ
193218
queries. See 5.0.0 possible breaking changes.
194219

220+
Build 5.0.6
221+
=============================
222+
223+
Release notes - NHibernate - Version 5.0.6
224+
225+
** Bug
226+
* #1672 Generated async methods do not correctly propagate OperationCanceledException
227+
* #1355 NH-3928 - Random invalid SQL generated when using bitwise operators
228+
229+
** Task
230+
* #1686 Release 5.0.6
231+
232+
Build 5.0.5
233+
=============================
234+
235+
Release notes - NHibernate - Version 5.0.5
236+
237+
** Bug
238+
* #1665 Have IFutureEnumerable.GetEnumerable executing immediatly the query
239+
240+
Build 5.0.4
241+
=============================
242+
243+
Release notes - NHibernate - Version 5.0.4
244+
245+
** Bug
246+
* #1658 Add missing cache setting
247+
195248
Build 5.0.3
196249
=============================
197250

@@ -303,6 +356,10 @@ Build 5.0.0
303356
the dialect. They resolve to 4000 length string and (28, 10) precision/scale decimals by default, and are
304357
trimmed down according to dialect. Those defaults can be overridden with query.default_cast_length,
305358
query.default_cast_precision and query.default_cast_scale settings.
359+
* Future queries with data provider not actually supporting them (not supporting mutliple queries in a single
360+
SQL command) are no more immediately executed at the .Future call. They are executed only when directly
361+
enumerated or when their IFutureEnumerable.GetEnumerable method is called. (This aligns them with the behavior
362+
of FutureValue.)
306363
* Dialects are now configurable. If you instantiate a dialect directly, make sure you call its Configure
307364
method, with as argument the properties of a NHibernate Configuration object. You may use instead
308365
Dialect.GetDialect methods, which configure the dialect before returning it.
@@ -531,6 +588,14 @@ Release notes - NHibernate - Version 5.0.0
531588
* [NH-4011] - Fix transaction scopes handling
532589

533590

591+
Build 4.1.2.GA
592+
=============================
593+
594+
Release notes - NHibernate - Version 4.1.2.GA
595+
596+
** Bug
597+
* #1355 NH-3928 - Random invalid SQL generated when using bitwise operators
598+
534599
Build 4.1.1.GA
535600
=============================
536601

‎src/NHibernate.Config.Templates/HANA.cfg.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
This template was written to work with NHibernate.Test.
4+
Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it
5+
for your own use before compile tests in VisualStudio.
6+
-->
7+
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
8+
<session-factory name="NHibernate.Test">
9+
<property name="connection.driver_class">NHibernate.Driver.HanaColumnStoreDriver</property>
10+
<!-- Sap.Data.Hana does not support re-enlisting in the same transaction, wrecking many usages
11+
with NHibernate when both NHibernate and the connection performs auto-enlistment. -->
12+
<property name="connection.connection_string">
13+
Server=localhost:39015;UserID=nhibernate;Password=;
14+
Enlist=false;
15+
</property>
16+
<property name="dialect">NHibernate.Dialect.HanaColumnStoreDialect</property>
17+
</session-factory>
18+
</hibernate-configuration>

‎src/NHibernate.Test/Ado/GenericBatchingBatcherFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
2828
{
2929
return !(dialect is FirebirdDialect) &&
3030
!(dialect is Oracle8iDialect) &&
31-
!(dialect is MsSqlCeDialect);
31+
!(dialect is MsSqlCeDialect) &&
32+
!(dialect is HanaDialectBase);
3233
}
3334

3435
[Test]

‎src/NHibernate.Test/Async/Ado/GenericBatchingBatcherFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
4141
{
4242
return !(dialect is FirebirdDialect) &&
4343
!(dialect is Oracle8iDialect) &&
44-
!(dialect is MsSqlCeDialect);
44+
!(dialect is MsSqlCeDialect) &&
45+
!(dialect is HanaDialectBase);
4546
}
4647

4748
[Test]

‎src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public async Task MergeEntityWithNonNullableEntityNullAsync()
155155
await (session.MergeAsync(route, cancellationToken));
156156
Assert.Fail("should have thrown an exception");
157157
}
158+
catch (OperationCanceledException) { throw; }
158159
catch (Exception ex)
159160
{
160161
Assert.That(ex, Is.TypeOf(typeof(PropertyValueException)));

0 commit comments

Comments
 (0)