Merge branch '3.3.x'

Author: oskarb

releasenotes.txt

@@ -25,7 +25,29 @@ Build vNext
         * ISession.SaveOrUpdateCopy removed: Use Merge instead
         * Oracle: The atan2 and power functions now return double (instead of single) for consistency with other dialects.
         * Removed FirebirdDriver. It was the same as FirebirdClientDriver since 3.2, and the latter have been the default since then.
-	* Removed bunch of unused methods on *Helper classes
+        * Removed bunch of unused methods on *Helper classes
+
+Build 3.3.3.GA
+=============================
+
+BEWARE: In versions prior to 3.3.3.CR1, the handling of the LINQ Take() method
+        was flawed - no matter where in the query Take() was placed it was
+        always applied as if it had been placed at the end. 3.3.3 fixes this,
+        so that Take() now correctly follows the .Net semantics. That is, in
+        3.3.3, the following queries might now give different results:
+
+            session.Query<Foo>.OrderBy(...).Take(5).Where(...);
+            session.Query<Foo>.Where(...).OrderBy(...).Take(5);
+
+        Starting with 3.3.3, the first query will generate a subquery to correctly
+        apply the row limit before the where-clause.
+
+** Bug
+    * [NH-2408] - SQL Server pessimistic locking syntax incorrect for union-subclass
+    * [NH-3109] - Rounding float values in aggregate functions with group by statements (MySQL).
+    * [NH-3324] - HQL: ArgumentNullException when using LEFT OUTER JOIN and SetMaxResults
+    * [NH-3408] - System.IndexOutOfRangeException when using Contains on a List<byte[]>
+    * [NH-3413] - Clearing a list used by Contains causes subsequent queries to fail
 
 Build 3.3.3.CR1
 =============================

src/NHibernate.Test/DialectTest/LockHintAppenderFixture.cs

@@ -17,7 +17,7 @@ public void SetUp()
 			_appender = new MsSql2000Dialect.LockHintAppender(new MsSql2000Dialect(), new Dictionary<string, LockMode> { {"person", LockMode.Upgrade} });
 		}
 
-		[Test]
+		[Test]
 		public void AppendHintToSingleTableAlias()
 		{
 			const string expectedQuery1 = "select * from Person person with (updlock, rowlock)";

src/NHibernate.Test/Linq/ByMethod/GetValueOrDefaultTests.cs

@@ -0,0 +1,39 @@
+using System.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.Linq.ByMethod
+{
+	[TestFixture]
+	public class GetValueOrDefaultTests : LinqTestCase
+	{
+		[Test]
+		public void CoalesceInWhere()
+		{
+			var orders = db.Orders
+						   .Where(x => (x.Freight ?? 100) > 0)
+						   .ToList();
+
+			Assert.AreEqual(830, orders.Count);
+		}
+
+		[Test]
+		public void GetValueOrDefaultInWhere()
+		{
+			var orders = db.Orders
+						   .Where(x => x.Freight.GetValueOrDefault(100) > 0)
+						   .ToList();
+
+			Assert.AreEqual(830, orders.Count);
+		}
+
+		[Test]
+		public void GetValueOrDefaultWithSingleArgumentInWhere()
+		{
+			var orders = db.Orders
+						   .Where(x => x.Freight.GetValueOrDefault() > 0)
+						   .ToList();
+
+			Assert.AreEqual(830, orders.Count);
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3074/Fixture.cs

@@ -35,7 +35,8 @@ protected override void OnSetUp()
 			}
 		}
 
-		[Test, Ignore("Not fixed yet")]
+		[Test]
+		[Ignore("Fails on at least Oracle and PostgreSQL. See NH-3074 and NH-2408.")]
 		public void HqlCanSetLockMode()
 		{
 			using (var s = OpenSession())

src/NHibernate.Test/NHibernate.Test.csproj

@@ -502,6 +502,7 @@
     <Compile Include="Linq\ByMethod\CastTests.cs" />
     <Compile Include="Linq\ByMethod\GroupByHavingTests.cs" />
     <Compile Include="Linq\ByMethod\GroupByTests.cs" />
+    <Compile Include="Linq\ByMethod\GetValueOrDefaultTests.cs" />
     <Compile Include="Linq\CasingTest.cs" />
     <Compile Include="Linq\CharComparisonTests.cs" />
     <Compile Include="Linq\DateTimeTests.cs" />

src/NHibernate/Linq/Functions/DefaultLinqToHqlGeneratorsRegistry.cs

@@ -20,6 +20,7 @@ public DefaultLinqToHqlGeneratorsRegistry()
 			RegisterGenerator(new GenericDictionaryContainsKeyRuntimeHqlGenerator());
 			RegisterGenerator(new ToStringRuntimeMethodHqlGenerator());
 			RegisterGenerator(new LikeGenerator());
+			RegisterGenerator(new GetValueOrDefaultGenerator());
 
 			RegisterGenerator(new CompareGenerator());
 			this.Merge(new CompareGenerator());

src/NHibernate/Linq/Functions/GetValueOrDefaultGenerator.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq.Expressions;
+using System.Reflection;
+using NHibernate.Hql.Ast;
+using NHibernate.Linq.Visitors;
+using NHibernate.Util;
+
+namespace NHibernate.Linq.Functions
+{
+	internal class GetValueOrDefaultGenerator : IHqlGeneratorForMethod, IRuntimeMethodHqlGenerator
+	{
+		public bool SupportsMethod(MethodInfo method)
+		{
+			return method != null && String.Equals(method.Name, "GetValueOrDefault", StringComparison.OrdinalIgnoreCase) && method.IsMethodOf(typeof (Nullable<>));
+		}
+
+		public IHqlGeneratorForMethod GetMethodGenerator(MethodInfo method)
+		{
+			return this;
+		}
+
+		public IEnumerable<MethodInfo> SupportedMethods
+		{
+			get { throw new NotSupportedException("This is an runtime method generator"); }
+		}
+
+		public HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
+		{
+			return treeBuilder.Coalesce(visitor.Visit(targetObject).AsExpression(), GetRhs(method, arguments, treeBuilder, visitor));
+		}
+
+		private static HqlExpression GetRhs(MethodInfo method, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
+		{
+			if (arguments.Count > 0)
+				return visitor.Visit(arguments[0]).AsExpression();
+
+			var returnType = method.ReturnType;
+			var instance = returnType.IsValueType ? Activator.CreateInstance(returnType) : null;
+			return treeBuilder.Constant(instance);
+		}
+	}
+}

src/NHibernate/NHibernate.csproj

@@ -284,6 +284,7 @@
     <Compile Include="Linq\Clauses\NhWithClause.cs" />
     <Compile Include="Linq\ExpressionTransformers\RemoveCharToIntConversion.cs" />
     <Compile Include="Linq\ExpressionTransformers\RemoveRedundantCast.cs" />
+    <Compile Include="Linq\Functions\GetValueOrDefaultGenerator.cs" />
     <Compile Include="Linq\Functions\MathGenerator.cs" />
     <Compile Include="Linq\Functions\DictionaryGenerator.cs" />
     <Compile Include="Linq\Functions\EqualsGenerator.cs" />

src/NHibernate/NHibernate.nuspec.template

@@ -10,6 +10,10 @@
     <description>
       NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.
     </description>
+	<releaseNotes>
+	  Many bug fixes and some new features. Beware that the processing of LINQ's Take() has been corrected, which may give different results for some queries.
+	  See the full release notes at https://github.com/nhibernate/nhibernate-core/blob/3.3.x/releasenotes.txt.
+	</releaseNotes>
     <language>en-US</language>
     <tags>ORM, DataBase, DAL, ObjectRelationalMapping</tags>
     <dependencies>

teamcity.build

@@ -23,8 +23,10 @@
 
 	<target name="verify-test-results">
 		<if test="${property::exists('NHibernate.Test.IgnoreFail')}">
-			<copy file="${teamcity.last.result}" todir="${testresults.dir}"  />
+			<!-- Process the current results first, so that these will be available in build artifacts even
+				 if the last-result files is missing. -->
 			<property name="teamcity.current.result" value="${testResult::StripTimings(testresults.dir + '/NHibernate.Test.dll-results.xml', 'NHibernate.Test.current-results.xml')}" />
+			<copy file="${teamcity.last.result}" todir="${testresults.dir}"  />
 			<property name="teamcity.report" value="${testResult::CompareResults(teamcity.current.result, teamcity.last.result)}" />
 		</if>
 	</target>