Skip to content

Commit 399598f

Browse files
hazzikhazzik
authored
Merge branch 'master' into NH-2319
2 parents cec841b + 5cb7b3f commit 399598f

File tree

568 files changed

+13169
-27245
lines changed

Some content is hidden

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

568 files changed

+13169
-27245
lines changed

‎Contributor Guide.html

Lines changed: 0 additions & 164 deletions
This file was deleted.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ NuGet (<http://nuget.org/List/Packages/NHibernate>).
1919

2020
Alternatively binaries are available from SourceForge at <http://sourceforge.net/projects/nhibernate>.
2121

22-
You are encouraged to review the release notes (releasenotes.txt), particularly when upgrading to a
22+
You are encouraged to review the release notes ([releasenotes.txt](releasenotes.txt)), particularly when upgrading to a
2323
later version. The release notes will generally document any breaking changes.
2424

2525
Community Forums

‎ShowBuildMenu.bat

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ echo F. Add a test configuration for PostgreSQL.
5050
echo G. Add a test configuration for Oracle.
5151
echo H. Add a test configuration for SQL Server Compact (x86).
5252
echo I. Add a test configuration for SQL Server Compact (x64).
53+
echo J. Add a test configuration for MySql.
5354
echo.
5455
echo X. Exit to main menu.
5556
echo.
5657

57-
%BUILDTOOL% prompt ABCDEFGHIX
58-
if errorlevel 9 goto main-menu
58+
%BUILDTOOL% prompt ABCDEFGHIJX
59+
if errorlevel 10 goto main-menu
60+
if errorlevel 9 goto test-setup-mysql
5961
if errorlevel 8 goto test-setup-sqlservercex64
6062
if errorlevel 7 goto test-setup-sqlservercex86
6163
if errorlevel 6 goto test-setup-oracle
@@ -91,14 +93,12 @@ goto test-setup-generic
9193
set CONFIG_NAME=FireBird
9294
set PLATFORM=x86
9395
set LIB_FILES=lib\teamcity\firebird\*.dll
94-
set LIB_FILES2=lib\teamcity\firebird\x86\*
9596
goto test-setup-generic
9697

9798
:test-setup-firebirdx64
9899
set CONFIG_NAME=FireBird
99100
set PLATFORM=x64
100101
set LIB_FILES=lib\teamcity\firebird\*.dll
101-
set LIB_FILES2=lib\teamcity\firebird\x64\*
102102
goto test-setup-generic
103103

104104
:test-setup-sqlitex86
@@ -122,6 +122,13 @@ set LIB_FILES=lib\teamcity\postgresql\*.dll
122122
set LIB_FILES2=
123123
goto test-setup-generic
124124

125+
:test-setup-mysql
126+
set CONFIG_NAME=MySql
127+
set PLATFORM=AnyCPU
128+
set LIB_FILES=lib\teamcity\mysql\*.dll
129+
set LIB_FILES2=
130+
goto test-setup-generic
131+
125132
:test-setup-oracle
126133
set CONFIG_NAME=Oracle
127134
set PLATFORM=x86
@@ -130,6 +137,7 @@ set LIB_FILES2=
130137
goto test-setup-generic
131138

132139
:test-setup-generic
140+
set CFGNAME=
133141
set /p CFGNAME=Enter a name for your test configuration or press enter to use default name:
134142
if /I "%CFGNAME%"=="" set CFGNAME=%CONFIG_NAME%-%PLATFORM%
135143
mkdir "%AVAILABLE_CONFIGURATIONS%\%CFGNAME%"

‎doc/reference/modules/architecture.xml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,44 +239,54 @@
239239
</para>
240240

241241
<itemizedlist>
242+
<listitem>
243+
<para>
244+
<literal>NHibernate.Context.AsyncLocalSessionContext</literal> - current sessions are tracked
245+
by current asynchronous flow. You are responsible to bind and unbind an
246+
<literal>ISession</literal> instance with static methods of class
247+
<literal>CurrentSessionContext</literal>. Binding operations from inner flows will not be
248+
propagated to outer or siblings flows.
249+
</para>
250+
</listitem>
242251
<listitem>
243252
<para>
244253
<literal>NHibernate.Context.CallSessionContext</literal> - current sessions are tracked
245-
by <literal>CallContext</literal>. You are responsible to bind and unbind an <literal>
246-
ISession</literal> instance with static methods of class <literal>CurrentSessionContext
247-
</literal>.
254+
by <literal>CallContext</literal>. You are responsible to bind and unbind an
255+
<literal>ISession</literal> instance with static methods of class
256+
<literal>CurrentSessionContext</literal>.
248257
</para>
249258
</listitem>
250259
<listitem>
251260
<para>
252261
<literal>NHibernate.Context.ThreadStaticSessionContext</literal> - current session is
253-
stored in a thread-static variable. This context only supports one session factory.
262+
stored in a thread-static variable. This context supports multiple session factory only
263+
since NHibernate v5.
254264
You are responsible to bind and unbind an <literal>ISession</literal> instance with
255265
static methods of class <literal>CurrentSessionContext</literal>.
256266
</para>
257267
</listitem>
258268
<listitem>
259269
<para>
260-
<literal>NHibernate.Context.WebSessionContext</literal> -
261-
stores the current session in <literal>HttpContext</literal>.
262-
You are responsible to bind and unbind an <literal>ISession</literal>
263-
instance with static methods of class <literal>CurrentSessionContext</literal>.
270+
<literal>NHibernate.Context.WebSessionContext</literal> -
271+
stores the current session in <literal>HttpContext</literal>.
272+
You are responsible to bind and unbind an <literal>ISession</literal>
273+
instance with static methods of class <literal>CurrentSessionContext</literal>.
264274
</para>
265275
</listitem>
266276
<listitem>
267277
<para>
268278
<literal>NHibernate.Context.WcfOperationSessionContext</literal> - current sessions are tracked
269279
by WCF <literal>OperationContext</literal>. You need to register the <literal>WcfStateExtension</literal>
270-
extension in WCF. You are responsible to bind and unbind an <literal>ISession
271-
</literal> instance with static methods of class <literal>CurrentSessionContext</literal>.
280+
extension in WCF. You are responsible to bind and unbind an <literal>ISession</literal>
281+
instance with static methods of class <literal>CurrentSessionContext</literal>.
272282
</para>
273283
</listitem>
274284
<listitem>
275285
<para>
276286
<literal>NHibernate.Context.ManagedWebSessionContext</literal> - current
277-
sessions are tracked by <literal>HttpContext</literal>. Removed in NHibernate 4.0
278-
- <literal>NHibernate.Context.WebSessionContext</literal> should be used instead.
279-
You are responsible to bind and unbind an <literal>ISession</literal> instance with static methods
287+
sessions are tracked by <literal>HttpContext</literal>. Removed in NHibernate 4.0
288+
- <literal>NHibernate.Context.WebSessionContext</literal> should be used instead.
289+
You are responsible to bind and unbind an <literal>ISession</literal> instance with static methods
280290
on this class, it never opens, flushes, or closes an <literal>ISession</literal> itself.
281291
</para>
282292
</listitem>
@@ -287,7 +297,8 @@
287297
defines which <literal>NHibernate.Context.ICurrentSessionContext</literal> implementation
288298
should be used. Typically, the value of this parameter would just name the implementation
289299
class to use (including the assembly name); for the out-of-the-box implementations, however,
290-
there are corresponding short names: "call", "thread_static", "web" and "wcf_operation",
300+
there are corresponding short names: <literal>async_local</literal>, <literal>call</literal>,
301+
<literal>thread_static</literal>, <literal>web</literal> and <literal>wcf_operation</literal>,
291302
respectively.
292303
</para>
293304
</sect1>

‎doc/reference/modules/basic_mapping.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,6 +3114,11 @@
31143114
...
31153115
</class>]]></programlisting>
31163116

3117+
<para>
3118+
Quoting column identifiers is required if a table contains two columns differing only by case.
3119+
Ensure you use consistent casing when quoting identifiers.
3120+
</para>
3121+
31173122
</sect1>
31183123

31193124
<sect1 id="mapping-modularfiles">

‎doc/reference/modules/configuration.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,13 @@ ISession session = sessions.OpenSession(conn);
675675
available in PostgreSQL 8.2.
676676
</entry>
677677
</row>
678+
<row>
679+
<entry>PostgreSQL 8.3</entry>
680+
<entry><literal>NHibernate.Dialect.PostgreSQL83Dialect</literal></entry>
681+
<entry>
682+
This dialect supports <literal>XML</literal> type.
683+
</entry>
684+
</row>
678685
<row>
679686
<entry>MySQL 3 or 4</entry>
680687
<entry><literal>NHibernate.Dialect.MySQLDialect</literal></entry>

‎lib/teamcity/firebird/FirebirdSql.Data.FirebirdClient.dll

223 KB
Binary file not shown.

0 commit comments

Comments
 (0)