Merge tag '5.3.1'

Author: hazzik

build-common/NHibernate.props

@@ -27,6 +27,7 @@
 
     <PackageProjectUrl>https://nhibernate.info</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
+    <PackageIcon>NHibernate-NuGet.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageReleaseNotes Condition="'$(VersionSuffix)' == ''">https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>

releasenotes.txt

@@ -1,4 +1,24 @@
-Build 5.3.0
+Build 5.3.1
+=============================
+
+Release notes - NHibernate - Version 5.3.1
+
+7 issues were resolved in this release.
+
+** Bug
+
+   * #2445 LINQ queries with a cast from int to uint fail
+   * #2440 InvalidCastException for Future Criteria with aliased fetches 
+   * #2439 Invalid parameter conversion for enums
+   * #2437 Invalid cast on nullable custom type with Linq
+
+** Task
+
+   * #2450 Release 5.3.1
+   * #2436 Fix old http://nhibernate.info URIs
+   * #2435 Fix iconUrl warning
+
+Build 5.3.0
 =============================
 
 Release notes - NHibernate - Version 5.3.0

src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs

@@ -480,6 +480,72 @@ public async Task OrderedInnerJoinFetchAsync()
 			}
 		}
 
+		//GH-2440
+		[Test]
+		public async Task FetchWithAliasedJoinFutureAsync()
+		{
+			using (var session = OpenSession())
+			{
+				EntityComplex alias = null;
+				EntitySimpleChild child1 = null;
+				var list = (await (session.QueryOver<EntityComplex>(() => alias)
+								.Where(ec => ec.Id == _parentEntityComplexId)
+								.JoinQueryOver(() => alias.Child1, () => child1)
+								.Fetch(SelectMode.Fetch, () => alias.ChildrenList)
+								.TransformUsing(Transformers.DistinctRootEntity)
+								.Future()
+								.GetEnumerableAsync()))
+								.ToList();
+
+				var childList = list[0].ChildrenList;
+				Assert.That(list[0].ChildrenList.Count, Is.GreaterThan(1));
+				Assert.That(list[0].ChildrenList, Is.EqualTo(list[0].ChildrenList.OrderByDescending(c => c.OrderIdx)), "wrong order");
+			}
+		}
+
+		//GH-2440
+		[Test]
+		public async Task CacheableFetchWithAliasedJoinFutureAsync()
+		{
+			using (var session = OpenSession())
+			{
+				EntityComplex alias = null;
+				EntitySimpleChild child1 = null;
+				var list = (await (session.QueryOver<EntityComplex>(() => alias)
+								.Where(ec => ec.Id == _parentEntityComplexId)
+								.JoinQueryOver(() => alias.Child1, () => child1)
+								.Fetch(SelectMode.Fetch, () => alias.ChildrenList)
+								.TransformUsing(Transformers.DistinctRootEntity)
+								.Cacheable()
+								.Future()
+								.GetEnumerableAsync()))
+								.ToList();
+				EntityComplex value = null;
+				Assert.DoesNotThrow(() => value = list[0]);
+				Assert.That(value, Is.Not.Null);
+			}
+
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex alias = null;
+				EntitySimpleChild child1 = null;
+				var list = session.QueryOver<EntityComplex>(() => alias)
+								.Where(ec => ec.Id == _parentEntityComplexId)
+								.JoinQueryOver(() => alias.Child1, () => child1)
+								.Fetch(SelectMode.Fetch, () => alias.ChildrenList)
+								.TransformUsing(Transformers.DistinctRootEntity)
+								.Cacheable()
+								.Future()
+								.ToList();
+				EntityComplex value = null;
+				Assert.DoesNotThrow(() => value = list[0]);
+				Assert.That(value, Is.Not.Null);
+
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(0), "Query is expected to be retrieved from cache");
+			}
+		}
+
 		[Test, Obsolete]
 		public async Task FetchModeEagerForLazyAsync()
 		{

src/NHibernate.Test/Async/NHSpecificTest/GH2437/Fixture.cs

@@ -0,0 +1,144 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.GH2437
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.AddMapping<UserMapping>();
+			mapper.AddMapping<UserSessionMapping>();
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var user = new User { UserCode = "gokhanabatay", IsOpen = true, UserName = "Gökhan Abatay" };
+				session.Save(user);
+
+				for (var i = 0; i < 10; i++)
+				{
+					var userSession = new UserSession
+					{
+						Claims = "My Claims",
+						ExpireDateTime = DateTime.Now.AddDays(1),
+						MbrId = 1,
+						OpenDate = DateTime.Now,
+						LocalIpAddress = "192.168.1.1",
+						RemoteIpAddress = "127.0.0.1",
+						LocalPort = 80 + i.ToString(),
+						RemotePort = 80 + i.ToString(),
+						DeviceId = "None",
+						UserCode = "gokhanabatay",
+						IsOpen = true
+					};
+
+					session.Save(userSession);
+				}
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from UserSession").ExecuteUpdate();
+				session.CreateQuery("delete from User").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task Get_DateCustomType_NullableDateValueEqualsAsync()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var sessions = await (session.Query<UserSession>().Where(x => x.OpenDate.Value == DateTime.Now).ToListAsync());
+
+				Assert.That(sessions, Has.Count.EqualTo(10));
+			}
+		}
+
+		[Test]
+		public async Task Get_DateTimeCustomType_NullableDateValueEqualsAsync()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var sessions = await (session.Query<UserSession>().Where(x => x.ExpireDateTime.Value > DateTime.Now).ToListAsync());
+
+				Assert.That(sessions, Has.Count.EqualTo(10));
+			}
+		}
+
+		[Test]
+		public async Task Get_DateCustomType_DateEqualsAsync()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var sessions = await (session.Query<UserSession>().Where(x => x.OpenDate == DateTime.Now).ToListAsync());
+
+				Assert.That(sessions, Has.Count.EqualTo(10));
+			}
+		}
+
+		[Test]
+		public async Task Get_DateTimeCustomType_DateEqualsAsync()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var sessions = await (session.Query<UserSession>().Where(x => x.ExpireDateTime > DateTime.Now).ToListAsync());
+
+				Assert.That(sessions, Has.Count.EqualTo(10));
+			}
+		}
+
+		[Test]
+		public async Task Get_BooleanCustomTypeAsync()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var results = await (session.Query<UserSession>()
+					.Where(x => x.OpenDate == DateTime.Now)
+					.Select(x => new NullableBooleanResult() {IsOpen = x.User.IsOpen})
+					.ToListAsync());
+				
+				Assert.That(results, Has.Count.EqualTo(10));
+			}
+		}
+
+		public class NullableBooleanResult
+		{
+			public bool? IsOpen { get; set; }
+		}
+	}
+}