Merge branch 'master' into gamblen-Ingres9Sequences

Author: hazzik

.gitattributes

@@ -12,11 +12,11 @@
 *.msbuild text
 *.md      text
 
-*.sln text eol=crlf merge=union
-*.csproj text merge=union
-*.vbproj text merge=union
-*.fsproj text merge=union
-*.dbproj text merge=union
+*.sln text eol=crlf
+*.csproj text eol=crlf
+*.vbproj text eol=crlf
+*.fsproj text eol=crlf
+*.dbproj text eol=crlf
 
 # Resharper DotSettings files are in Unix format
 *.DotSettings text eol=lf 

Contributor Guide.html

@@ -19,7 +19,7 @@ NuGet (<http://nuget.org/List/Packages/NHibernate>).
 
 Alternatively binaries are available from SourceForge at <http://sourceforge.net/projects/nhibernate>.
 
-You are encouraged to review the release notes (releasenotes.txt), particularly when upgrading to a 
+You are encouraged to review the release notes ([releasenotes.txt](releasenotes.txt)), particularly when upgrading to a 
 later version. The release notes will generally document any breaking changes.
 
 Community Forums
@@ -46,9 +46,13 @@ can be found [here][C2].
 Licenses
 --------
 
-This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see lgpl.txt).
+- This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see [LICENSE.txt][D2]).
+- The documentation for this software is distributed under the terms of the Free Software Foundation [GNU Free Documentation License (GNU FDL), version 1.1][D3] (see [doc/LICENSE.txt][D4]).
 
 [D1]: http://www.gnu.org/licenses/lgpl-2.1-standalone.html
+[D2]: LICENSE.txt
+[D3]: http://www.gnu.org/licenses/old-licenses/fdl-1.1-standalone.html
+[D4]: doc/LICENSE.txt
 
 Credits
 -------

lgpl.txt renamed to LICENSE.txt

@@ -50,12 +50,14 @@ echo F. Add a test configuration for PostgreSQL.
 echo G. Add a test configuration for Oracle.
 echo H. Add a test configuration for SQL Server Compact (x86).
 echo I. Add a test configuration for SQL Server Compact (x64).
+echo J. Add a test configuration for MySql.
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIX
-if errorlevel 9 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIJX
+if errorlevel 10 goto main-menu
+if errorlevel 9 goto test-setup-mysql
 if errorlevel 8 goto test-setup-sqlservercex64
 if errorlevel 7 goto test-setup-sqlservercex86
 if errorlevel 6 goto test-setup-oracle
@@ -91,14 +93,12 @@ goto test-setup-generic
 set CONFIG_NAME=FireBird
 set PLATFORM=x86
 set LIB_FILES=lib\teamcity\firebird\*.dll
-set LIB_FILES2=lib\teamcity\firebird\x86\*
 goto test-setup-generic
 
 :test-setup-firebirdx64
 set CONFIG_NAME=FireBird
 set PLATFORM=x64
 set LIB_FILES=lib\teamcity\firebird\*.dll
-set LIB_FILES2=lib\teamcity\firebird\x64\*
 goto test-setup-generic
 
 :test-setup-sqlitex86
@@ -122,6 +122,13 @@ set LIB_FILES=lib\teamcity\postgresql\*.dll
 set LIB_FILES2=
 goto test-setup-generic
 
+:test-setup-mysql
+set CONFIG_NAME=MySql
+set PLATFORM=AnyCPU
+set LIB_FILES=lib\teamcity\mysql\*.dll
+set LIB_FILES2=
+goto test-setup-generic
+
 :test-setup-oracle
 set CONFIG_NAME=Oracle
 set PLATFORM=x86
@@ -130,6 +137,7 @@ set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-generic
+set CFGNAME=
 set /p CFGNAME=Enter a name for your test configuration or press enter to use default name: 
 if /I "%CFGNAME%"=="" set CFGNAME=%CONFIG_NAME%-%PLATFORM%
 mkdir "%AVAILABLE_CONFIGURATIONS%\%CFGNAME%"

README.md

@@ -78,8 +78,6 @@
 		<foreach item="String" delim=" " property="framework" in="${supported.frameworks}">
 			<call target="set-${framework}-framework-configuration" />
 			<call target="build" />
-			<!-- Copy and rename the license -->
-			<copy file="lgpl.txt" tofile="${bin.dir}/NHibernate.license.txt"  />
 		</foreach>
 
 		<!-- Reset the current framework to the saved value -->
@@ -124,10 +122,9 @@
 				<include name="build-common/**" />
 
 				<include name="*.build" />
-				<include name="gfdl.txt" />
-				<include name="lgpl.txt" />
+				<include name="LICENSE.txt" />
 				<include name="releasenotes.txt" />
-				<include name="readme.html" />
+				<include name="README.md" />
 
 				<!-- exclude ReSharper stuff -->
 				<exclude name="**/_ReSharper*/**" />
@@ -170,8 +167,7 @@
 		<property name="bin-pack.tests" value="${bin-pack.tmpdir}/Tests" />
 
 		<copy file="releasenotes.txt" todir="${bin-pack.tmpdir}"/>
-		<copy file="lgpl.txt" todir="${bin-pack.tmpdir}/NHibernate.license.txt"/>
-		<copy file="gfdl.txt" todir="${bin-pack.tmpdir}"/>
+		<copy file="LICENSE.txt" todir="${bin-pack.tmpdir}"/>
 		<copy file="HowInstall.txt" todir="${bin-pack.tmpdir}"/>
 
 		<exec program="CScript.exe"

ShowBuildMenu.bat

@@ -26,6 +26,7 @@
 
 	<target name="manual" depends="init">
 		<property name="lang" value="en" />
+		<copy file="LICENSE.txt" todir="${doc.out.dir}"/>
 		<nant target="build" buildfile="reference/reference.build">
 			<properties>
 				<property name="lang" value="${lang}" />

default.build

@@ -239,44 +239,54 @@
         </para>
 
         <itemizedlist>
+            <listitem>
+                <para>
+                    <literal>NHibernate.Context.AsyncLocalSessionContext</literal> - current sessions are tracked
+                    by current asynchronous flow. You are responsible to bind and unbind an
+                    <literal>ISession</literal> instance with static methods of class
+                    <literal>CurrentSessionContext</literal>. Binding operations from inner flows will not be
+                    propagated to outer or siblings flows.
+                </para>
+            </listitem>
             <listitem>
                 <para>
                     <literal>NHibernate.Context.CallSessionContext</literal> - current sessions are tracked
-                    by <literal>CallContext</literal>. You are responsible to bind and unbind an <literal>
-                    ISession</literal> instance with static methods of class <literal>CurrentSessionContext
-                    </literal>.
+                    by <literal>CallContext</literal>. You are responsible to bind and unbind an
+                    <literal>ISession</literal> instance with static methods of class
+                    <literal>CurrentSessionContext</literal>.
                 </para>
             </listitem>
             <listitem>
                 <para>
                     <literal>NHibernate.Context.ThreadStaticSessionContext</literal> - current session is
-                    stored in a thread-static variable. This context only supports one session factory.
+                    stored in a thread-static variable. This context supports multiple session factory only
+                    since NHibernate v5.
                     You are responsible to bind and unbind an <literal>ISession</literal> instance with
                     static methods of class <literal>CurrentSessionContext</literal>.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <literal>NHibernate.Context.WebSessionContext</literal> - 
-					stores the current session in <literal>HttpContext</literal>. 
-					You are responsible to bind and unbind an <literal>ISession</literal> 
-					instance with static methods of class <literal>CurrentSessionContext</literal>.
+                    <literal>NHibernate.Context.WebSessionContext</literal> -
+                    stores the current session in <literal>HttpContext</literal>.
+                    You are responsible to bind and unbind an <literal>ISession</literal>
+                    instance with static methods of class <literal>CurrentSessionContext</literal>.
                 </para>
             </listitem>
             <listitem>
                 <para>
                     <literal>NHibernate.Context.WcfOperationSessionContext</literal> - current sessions are tracked
                     by WCF <literal>OperationContext</literal>. You need to register the <literal>WcfStateExtension</literal>
-                    extension in WCF. You are responsible to bind and unbind an <literal>ISession
-                    </literal> instance with static methods of class <literal>CurrentSessionContext</literal>.
+                    extension in WCF. You are responsible to bind and unbind an <literal>ISession</literal>
+                    instance with static methods of class <literal>CurrentSessionContext</literal>.
                 </para>
             </listitem>
             <listitem>
                 <para>
                     <literal>NHibernate.Context.ManagedWebSessionContext</literal> - current
-                    sessions are tracked by <literal>HttpContext</literal>. Removed in NHibernate 4.0 
-					- <literal>NHibernate.Context.WebSessionContext</literal> should be used instead.
-					You are responsible to bind and unbind an <literal>ISession</literal> instance with static methods
+                    sessions are tracked by <literal>HttpContext</literal>. Removed in NHibernate 4.0
+                    - <literal>NHibernate.Context.WebSessionContext</literal> should be used instead.
+                    You are responsible to bind and unbind an <literal>ISession</literal> instance with static methods
                     on this class, it never opens, flushes, or closes an <literal>ISession</literal> itself.
                 </para>
             </listitem>
@@ -287,7 +297,8 @@
             defines which <literal>NHibernate.Context.ICurrentSessionContext</literal> implementation
             should be used. Typically, the value of this parameter would just name the implementation
             class to use (including the assembly name); for the out-of-the-box implementations, however,
-            there are corresponding short names: "call", "thread_static", "web" and "wcf_operation",
+            there are corresponding short names: <literal>async_local</literal>, <literal>call</literal>,
+            <literal>thread_static</literal>, <literal>web</literal> and <literal>wcf_operation</literal>,
             respectively.
         </para>
     </sect1>

gfdl.txt renamed to doc/LICENSE.txt

@@ -3114,6 +3114,11 @@
     ...
 </class>]]></programlisting>
 
+        <para>
+            Quoting column identifiers is required if a table contains two columns differing only by case.
+            Ensure you use consistent casing when quoting identifiers.
+        </para>
+
     </sect1>
 
    <sect1 id="mapping-modularfiles">