Merge branch 'master' into gamblen-Ingres9Sequences

Author: hazzik

.gitignore

@@ -12,3 +12,4 @@ current-test-configuration
 # to satisfy later build steps. But it should not be committed.
 NHibernate.dll
 TestResult.xml
+.vscode

CONTRIBUTING.md

@@ -72,21 +72,25 @@ Ensure that your e-mail address and name are configured appropriately in Git.
 
 Create a feature branch so it's easy to keep it separate from other improvements. Having a pull request accepted might involve further commits based on community feedback, so having the feature branch provides a tidy place to work from. Using the issue number as the branch name is good practice. 
 
-When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to link to automatically link your commits to the issue. For example: NH-1234 
+When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to automatically link your commits to the issue. By example: *NH-1234 - test case for blah trouble*.  Make sure you do not put any non whitespace character adjacent to the issue number, as this would prevent JIRA to match it. (Avoid *NH-1234: test case for blah trouble*.)
 
 ## Implementing the Bug Fix or Improvement
 
-Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is. While this may seem daunting at first, feel free to give it a go. It's just code afterall. :) 
+Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is. While this may seem daunting at first, feel free to give it a go. It's just code after all. :) 
 
 ### Ensure All Tests Pass
 
 Once you've made changes to the NHibernate code base, you'll want to ensure that you haven't caused any previously passing tests to fail. The easiest way to check this is to select option D from the build menu, ensure the root tree node is selected, then press run to have all the tests run. 
 
+Please note that some tests assume a case insensitive accent sensitive database when performing string comparison. Some tests assume SQL user locales to be en-US. They will fail otherwise. With SQL Server, collation with supplementary characters (\_SC suffix on collation name) are no supported by legacy tests on "text" types.
+
 ## Submit a Pull Request
 
 Be sure to link to the JIRA issue in your GitHub pull request. Also, go back to your JIRA issue and link to the pull request. 
 
-We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode. It is recomended you install editorconfig from the Visual Studio Extension Manager.
+We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode. It is recommended you install editorconfig from the Visual Studio Extension Manager.
+
+After submitting your pull request, come back later to check the outcome of automated builds. If some have failed, they will be listed in your pull request with a link to the corresponding TeamCity build. Find out in the build which tests are newly failing, and take appropriate action. Some of those builds have many known failing tests, which does not trigger a build failure. A *Comparison.txt* file in build Artifacts may help finding which failing tests are not known failing tests and must be addressed.
 
 ## Further Discussion
 

Contributor Guide.html

@@ -124,16 +124,20 @@ <h2>Commit your Test Case</h2>
 </p>
 
 <p>
-When you commit, please include the issue number in your commit message.  This will allow the JIRA issue tracker to link to automatically link your commits to the issue.  For example: NH-1234
+When you commit, please include the issue number in your commit message.  This will allow the JIRA issue tracker to automatically link your commits to the issue.  By example: <i>NH-1234 - test case for blah trouble</i>.  Make sure you do not put any non whitespace character adjacent to the issue number, as this would prevent JIRA to match it. (Avoid <i>NH-1234: test case for blah trouble</i>.)
 </p>
 
 <h2>Implementing the Bug Fix or Improvement</h2>
 
-Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is.  While this may seem daunting at first, feel free to give it a go.  It's just code afterall. :)
+Since you now have a failing test case, it should be straight-forward to step into NHibernate to attempt to ascertain what the problem is.  While this may seem daunting at first, feel free to give it a go.  It's just code after all. :)
 
 <h3>Ensure All Tests Pass</h3>
-
-Once you've made changes to the NHibernate code base, you'll want to ensure that you haven't caused any previously passing tests to fail.  The easiest way to check this is to select option D from the build menu, ensure the root tree node is selected, then press run to have all the tests run.
+<p>
+    Once you've made changes to the NHibernate code base, you'll want to ensure that you haven't caused any previously passing tests to fail.  The easiest way to check this is to select option D from the build menu, ensure the root tree node is selected, then press run to have all the tests run.
+</p>
+<p>
+    Please note that some tests assume a case insensitive accent sensitive database when performing string comparison.  Some tests assume SQL user locales to be en-US.  They will fail otherwise.  With SQL Server, collation with supplementary characters (_SC suffix on collation name) are no supported by legacy tests on "text" types.
+</p>
 
 <h2>Submit a Pull Request</h2>
 
@@ -142,7 +146,10 @@ <h2>Submit a Pull Request</h2>
 </p>
 <p>We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an 
     <a href="http://www.editorconfig.org/">editorconfig</a> configuration file to switch Visual Studio automatically between
-tabs and spaces mode. It is recomended you install editorconfig from the Visual Studio Extension Manager.</p>
+tabs and spaces mode. It is recommended you install editorconfig from the Visual Studio Extension Manager.</p>
+<p>
+    After submitting your pull request, come back later to check the outcome of automated builds. If some have failed, they will be listed in your pull request with a link to the corresponding TeamCity build. Find out in the build which tests are newly failing, and take appropriate action. Some of those builds have many known failing tests, which does not trigger a build failure. A <i>Comparison.txt</i> file in build Artifacts may help finding which failing tests are not known failing tests and must be addressed.
+</p>
 
 <h2>Further Discussion</h2>
 

README.md

@@ -64,8 +64,8 @@ of NHibernate (in no particular order):
 * [Log4net][] - logging, by the [Apache Software Foundation][]
 * [JetBrains][] - [ReSharper][] licences for NHibernate developers
 * [LinFu][] - proxy implementation (Philip Laureano)
-* Iesi.Collections - source code taken from an [article][Article] written by Jason Smith
-* [Relinq] - Linq provider for NHibernate
+* Iesi.Collections - source code taken from an [article][] written by Jason Smith
+* [Relinq][] - Linq provider for NHibernate
 
 [NUnit]: http://www.nunit.org
 [Nant]: http://nant.sourceforge.net
@@ -79,5 +79,5 @@ of NHibernate (in no particular order):
 [JetBrains]: http://www.jetbrains.com
 [ReSharper]: http://www.jetbrains.com/resharper
 [LinFu]: http://code.google.com/p/linfu
-[Article]: http://www.codeproject.com/KB/recipes/sets.aspx "Add Support for "Set" Collections to .NET"
-[Relinq]: http://relinq.codeplex.com/ "re-linq: Generic LINQ provider"
+[article]: http://www.codeproject.com/KB/recipes/sets.aspx
+[Relinq]: http://relinq.codeplex.com/

ShowBuildMenu.bat

@@ -5,7 +5,7 @@ set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-4.0
 set BUILDTOOL="%~dp0Tools\BuildTool\bin\Release\BuildTool.exe"
 set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
 set CURRENT_CONFIGURATION=%~dp0current-test-configuration
-set NUNIT="%~dp0Tools\nunit\nunit-x86.exe"
+set NUNIT="%~dp0Tools\NUnit.ConsoleRunner.3.6.0\tools\nunit3-console.exe"
 
 :main-menu
 echo ========================= NHIBERNATE BUILD MENU ==========================
@@ -22,20 +22,16 @@ echo E. Build NHibernate (Debug)
 echo F. Build NHibernate (Release)
 echo G. Build Release Package (Also runs tests and creates documentation)
 echo.
-echo --- GRAMMAR ---
-echo H. Grammar operations (related to Hql.g and HqlSqlWalker.g)
-echo.
 echo --- TeamCity (CI) build options
 echo I. TeamCity build menu
 echo.
 echo --- Exit ---
 echo X. Make the beautiful build menu go away.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIX
-if errorlevel 9 goto end
-if errorlevel 8 goto teamcity-menu
-if errorlevel 7 goto grammar-menu
+%BUILDTOOL% prompt ABCDEFGIX
+if errorlevel 8 goto end
+if errorlevel 7 goto teamcity-menu
 if errorlevel 6 goto build-release-package
 if errorlevel 5 goto build-release
 if errorlevel 4 goto build-debug
@@ -161,7 +157,7 @@ echo Configuration activated.
 goto main-menu
 
 :test-run
-start "" %NUNIT% NHibernate.nunit
+start "nunit3-console" cmd /K %NUNIT% --x86 --agents=1 --process=separate NHibernate.nunit
 goto main-menu
 
 rem :build-test
@@ -194,77 +190,6 @@ echo including NuGet packages and tools to push them.
 echo.
 goto main-menu
 
-:grammar-menu
-echo.
-echo --- GRAMMAR ---
-echo A. Regenerate all grammars.
-echo        Hql.g           to  HqlLexer.cs
-echo        Hql.g           to  HqlParser.cs
-echo        HqlSqlWalker.g  to  HqlSqlWalker.cs
-echo        SqlGenerator.g  to  SqlGenerator.cs
-echo B. Regenerate all grammars, with Hql.g in debug mode.
-echo C. Regenerate all grammars, with HqlSqlWalker.g in debug mode.
-echo D. Regenerate all grammars, with SqlGenerator.g in debug mode.
-echo E. Quick instructions on using debug mode.
-echo.
-echo X. Exit to main menu.
-echo.
-
-%BUILDTOOL% prompt ABCDEX
-if errorlevel 5 goto main-menu
-if errorlevel 4 goto antlr-debug
-if errorlevel 3 goto antlr-sqlgenerator-debug
-if errorlevel 2 goto antlr-hqlsqlwalker-debug
-if errorlevel 1 goto antlr-hql-debug
-if errorlevel 0 goto antlr-all
-
-:antlr-all
-echo *** Regenerating from Hql.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHql.bat
-echo *** Regenerating from HqlSqlWalker.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalker.bat
-echo *** Regenerating from SqlGenerator.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGenerator.bat
-goto main-menu
-
-:antlr-hql-debug
-echo *** Regenerating from Hql.g (Debug Enabled)
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlDebug.bat
-echo *** Regenerating from HqlSqlWalker.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalker.bat
-echo *** Regenerating from SqlGenerator.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGenerator.bat
-goto main-menu
-
-:antlr-hqlsqlwalker-debug
-echo *** Regenerating from Hql.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHql.bat
-echo *** Regenerating from HqlSqlWalker.g (Debug Enabled)
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalkerDebug.bat
-echo *** Regenerating from SqlGenerator.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGenerator.bat
-goto main-menu
-
-:antlr-sqlgenerator-debug
-echo *** Regenerating from Hql.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHql.bat
-echo *** Regenerating from HqlSqlWalker.g
-call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalker.bat
-echo *** Regenerating from SqlGenerator.g (Debug Enabled)
-call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGeneratorDebug.bat
-goto main-menu
-
-:antlr-debug
-echo To use the debug grammar:
-echo   1. Create a unit test that runs the hql parser on the input you're interested in.
-echo       The one you want to debug must be the first grammar parsed.
-echo   2. Run the unit test.  It will appear to stall.
-echo   3. Download and run AntlrWorks (java -jar AntlrWorks.jar).
-echo   4. Open the grammar you intend to debug in AntlrWorks.
-echo   5. Choose "Debug Remote" and accept the default port.
-echo   6. You should now be connected and able to step through your grammar.
-goto main-menu
-
 :teamcity-menu
 echo.
 echo --- TeamCity (CI) build options

Tools/.gitignore

@@ -0,0 +1,3 @@
+nuget.exe
+NUnit.*
+vswhere.*