Merge branch 'master' into AsyncUpgrade

Author: hazzik

.editorconfig

@@ -30,3 +30,6 @@ indent_size = 2
 [*.cshtml]
 indent_style = space
 indent_size = 4
+
+[*.g]
+indent_style = tab

.gitignore

@@ -16,4 +16,5 @@ TestResult.xml
 .DS_Store
 
 .idea/
-.vs/
+.vs/
+/build-common/NHibernate.dev.props

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.2.1.{build}
+version: 5.2.3.{build}
 image: Visual Studio 2017
 environment:
   matrix:

build-common/NHibernate.props

@@ -1,17 +1,19 @@
 <Project>
   <Import Project="DotNetSdkMono.props" />
+  <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
+
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">1</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
     <AssemblyVersion>$(VersionMajor).$(VersionMinor).0.0</AssemblyVersion>
     <FileVersion>$(VersionPrefix).0</FileVersion>
 
-    <NhAppTargetFrameworks>net461;netcoreapp2.0</NhAppTargetFrameworks>
-    <NhLibTargetFrameworks>net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
+    <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
+    <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
 
     <Product>NHibernate</Product>
     <Company>NHibernate.info</Company>

build-common/common.xml

@@ -13,8 +13,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.2.1" overwrite="false" />
-	<property name="project.version.numeric" value="5.2.1" overwrite="false" />
+	<property name="project.version" value="5.2.3" overwrite="false" />
+	<property name="project.version.numeric" value="5.2.3" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

doc/reference/modules/manipulating_data.xml

@@ -529,8 +529,7 @@ firstSession.Save(potentialMate);
 cat.Mate = potentialMate;
 
 // later, in a new session
-secondSession.Update(cat);  // update cat
-secondSession.Update(mate); // update mate]]></programlisting>
+secondSession.Update(cat);  // update cat]]></programlisting>
 
             <para>
                 If the <literal>Cat</literal> with identifier <literal>catId</literal> had already

releasenotes.txt

@@ -1,3 +1,29 @@
+Build 5.2.3
+=============================
+
+Release notes - NHibernate - Version 5.2.3
+
+1 issue was resolved in this release.
+
+** Bug
+
+   * #1964 Unable to serialize session because SerializationFieldInfo is not marked as serializable
+
+Build 5.2.2
+=============================
+
+Release notes - NHibernate - Version 5.2.2
+
+3 issues were resolved in this release.
+
+** Bug
+
+   * #1953 Query space invalidation doesn't work for bulk actions
+   * #1269 NH-3069 - Cannot use Session.Lock with Version column on abstract base class
+
+** Task
+
+   * #1957 Release 5.2.2
 
 Build 5.2.1
 =============================
@@ -269,6 +295,15 @@ Release notes - NHibernate - Version 5.2.0
 As part of releasing 5.2.0, a misnamed setting in 5.0.0 release notes has been fixed:
 transaction.use_connection_on_system_events correct name is transaction.use_connection_on_system_prepare
 
+Build 5.1.4
+=============================
+
+Release notes - NHibernate - Version 5.1.4
+
+** Bug
+
+   * #1959 Backport Query space invalidation doesn't work for bulk actions
+
 Build 5.1.3
 =============================
 

src/NHibernate.Test/Async/Criteria/Lambda/ProjectIntegrationFixture.cs

@@ -99,6 +99,8 @@ public async Task ProjectTransformToDtoAsync()
 				var actual = await (s.QueryOver<Person>()
 					.SelectList(list => list
 						.SelectGroup(p => p.Name).WithAlias(() => summary.Name)
+						//GH1985: DateTime.xxxx are not supported in SelectGroup
+						.SelectGroup(p => p.BirthDate.Year).WithAlias(() => summary.BirthYear)
 						.Select(Projections.RowCount()).WithAlias(() => summary.Count))
 					.OrderByAlias(() => summary.Name).Asc
 					.TransformUsing(Transformers.AliasToBean<PersonSummary>())
@@ -111,5 +113,26 @@ public async Task ProjectTransformToDtoAsync()
 				Assert.That(actual[1].Count, Is.EqualTo(1));
 			}
 		}
+
+		[Test]
+		public async Task ProjecionCountDistinctAsync()
+		{
+			if (!TestDialect.SupportsCountDistinct)
+				Assert.Ignore("Dialect does not support count distinct");
+
+			using (var s = OpenSession())
+			using (s.BeginTransaction())
+			{
+				var actual
+					= (await (s.QueryOver<Person>()
+					.SelectList(l =>
+					l.SelectCountDistinct(p => p.BirthDate.Year)
+					.SelectCountDistinct(p => p.Name))
+					.ListAsync<object[]>())).FirstOrDefault();
+
+				Assert.That((int) actual[0], Is.EqualTo(1), "distinct count by birth year");
+				Assert.That((int) actual[1], Is.EqualTo(2), "distinct count by name");
+			}
+		}
 	}
 }

src/NHibernate.Test/Async/Criteria/Lambda/SubQueryIntegrationFixture.cs

@@ -166,5 +166,32 @@ public async Task SubQueryAsync()
 				Assert.That(nameAndChildCount[1].ChildCount, Is.EqualTo(1));
 			}
 		}
+
+		//NH-3493 - Cannot use alias between more than 1 level of nested queries
+		[Test]
+		public async Task ThreeLevelSubqueryAsync()
+		{
+			if (!Dialect.SupportsScalarSubSelects)
+				Assert.Ignore("Dialect does not support scalar sub-select");
+
+			Person p = null;
+			var detachedCriteria2 = DetachedCriteria.For<Person>("vf_inner_2")
+				.SetProjection(Projections.Id())
+				.Add(Restrictions.Eq($@"mk.{nameof(p.Age)}", 20))
+				.Add(Restrictions.EqProperty("vf_inner_2.Id", "vf_inner.Id"));
+
+			var detachedCriteria1 = DetachedCriteria.For<Person>("vf_inner")
+				.SetProjection(Projections.Id())
+				.Add(Subqueries.Exists(detachedCriteria2))
+				.Add(Restrictions.EqProperty("vf_inner.Id", "vf.Id"));
+
+			using (var s = OpenSession())
+			{
+				await (s.CreateCriteria<Person>("vf")
+					.CreateAlias($"vf.{nameof(p.Father)}", "mk")
+					.AddOrder(Order.Asc(Projections.SubQuery(detachedCriteria1)))
+					.ListAsync<Person>());
+			}
+		}
 	}
 }

src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs

@@ -10,6 +10,7 @@
 
 using System.Linq;
 using NHibernate.Driver;
+using NHibernate.Linq;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Futures
@@ -18,9 +19,21 @@ namespace NHibernate.Test.Futures
 	[TestFixture]
 	public class FutureQueryFixtureAsync : FutureFixture
 	{
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from Person");
+				transaction.Commit();
+			}
+		}
+
 		[Test]
 		public async Task DefaultReadOnlyTestAsync()
 		{
+			CreatePersons();
+
 			//NH-3575
 			using (var s = Sfi.OpenSession())
 			{
@@ -125,23 +138,23 @@ public async Task CanExecuteMultipleQueryWithSameParameterNameAsync()
 			using (var s = Sfi.OpenSession())
 			{
 				IgnoreThisTestIfMultipleQueriesArentSupportedByDriver();
-			
+
 				var meContainer = s.CreateQuery("from Person p where p.Id = :personId")
 					.SetParameter("personId", 1)
 					.FutureValue<Person>();
-			
+
 				var possiblefriends = s.CreateQuery("from Person p where p.Id != :personId")
 					.SetParameter("personId", 2)
 					.Future<Person>();
 
 				using (var logSpy = new SqlLogSpy())
 				{
 					var me = await (meContainer.GetValueAsync());
-			
+
 					foreach (var person in await (possiblefriends.GetEnumerableAsync()))
 					{
 					}
-			
+
 					var events = logSpy.Appender.GetEvents();
 					Assert.AreEqual(1, events.Length);
 					var wholeLog = logSpy.GetWholeLog();
@@ -172,5 +185,24 @@ public async Task FutureExecutedOnGetEnumerableAsync()
 				Sfi.Statistics.IsStatisticsEnabled = false;
 			}
 		}
+
+		//NH-1953 - Future<> doesn't work on CreateFilter
+		[Test]
+		public async Task FutureOnFilterAsync()
+		{
+			CreatePersons();
+
+			using (var s = Sfi.OpenSession())
+			{
+				var person = await (s.Query<Person>().Where(n => n.Name == "ParentTwoChildren").FirstOrDefaultAsync());
+
+				var f1 = (await (s.CreateFilterAsync(person.Children, "where Age > 30"))).Future<Person>();
+				var f2 = (await (s.CreateFilterAsync(person.Children, "where Age > 5"))).Future<Person>();
+
+				Assert.That(person.Children.Count, Is.EqualTo(2), "invalid test set up");
+				Assert.That((await (f1.GetEnumerableAsync())).ToList().Count, Is.EqualTo(0), "Invalid filtered results");
+				Assert.That((await (f2.GetEnumerableAsync())).ToList().Count, Is.EqualTo(1), "Invalid filtered results");
+			}
+		}
 	}
 }

src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs

@@ -20,9 +20,21 @@ namespace NHibernate.Test.Futures
 	[TestFixture]
 	public class LinqFutureFixtureAsync : FutureFixture
 	{
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from Person");
+				transaction.Commit();
+			}
+		}
+
 		[Test]
 		public async Task DefaultReadOnlyTestAsync()
 		{
+			CreatePersons();
+
 			//NH-3575
 			using (var s = Sfi.OpenSession())
 			{
@@ -56,13 +68,6 @@ public async Task CoalesceShouldWorkForFuturesAsync()
 				var person = s.Query<Person>().Where(p => (p.Name ?? "e") == "e").ToFutureValue();
 				Assert.AreEqual(personId, (await (person.GetValueAsync())).Id);
 			}
-
-			using (ISession s = OpenSession())
-			using (ITransaction tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Person"));
-				await (tx.CommitAsync());
-			}
 		}
 
 		[Test]
@@ -137,13 +142,6 @@ public async Task CanUseSkipAndFetchManyWithToFutureAsync()
 					Assert.AreEqual(1, events.Length);
 				}
 			}
-
-			using (ISession s = OpenSession())
-			using (ITransaction tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Person"));
-				await (tx.CommitAsync());
-			}
 		}
 
 		[Test]
@@ -270,13 +268,6 @@ public async Task CanUseFutureFetchQueryAsync()
 					Assert.AreEqual(1, events.Length);
 				}
 			}
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Person"));
-				await (tx.CommitAsync());
-			}
 		}
 
 		[Test]
@@ -360,13 +351,6 @@ public async Task CanCombineSingleFutureValueWithFetchManyAsync()
 
 				Assert.AreEqual(personId, (await (meContainer.GetValueAsync())).Id);
 			}
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Person"));
-				await (tx.CommitAsync());
-			}
 		}
 
 		[Test]
@@ -435,12 +419,6 @@ public async Task UsingManyParametersAndQueries_DoesNotCauseParameterNameCollisi
 					Assert.That(result.Count,Is.EqualTo(1));
 				}
 			}
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Person"));
-				await (tx.CommitAsync());
-			}
 		}
 
 		[Test]
@@ -526,13 +504,6 @@ public async Task FutureCombineCachedAndNonCachedQueriesAsync()
 
 				Assert.That(Sfi.Statistics.PrepareStatementCount , Is.EqualTo(0), "Future queries must be retrieved from cache");
 			}
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Person"));
-				await (tx.CommitAsync());
-			}
 		}
 
 		[Test]
@@ -557,5 +528,22 @@ public async Task FutureAutoFlushAsync()
 				Assert.That(count, Is.EqualTo(0), "Session wasn't auto flushed.");
 			}
 		}
+
+		[Test]
+		public async Task FutureOnQueryableFilterAsync()
+		{
+			CreatePersons();
+
+			using (var s = Sfi.OpenSession())
+			{
+				var person = await (s.Query<Person>().Where(n => n.Name == "ParentTwoChildren").FirstOrDefaultAsync());
+				var f1 = person.Children.AsQueryable().Where(p => p.Age > 30).ToFuture();
+				var f2 = person.Children.AsQueryable().Where(p => p.Age > 5).ToFuture();
+
+				Assert.That(person.Children.Count, Is.EqualTo(2), "invalid test set up");
+				Assert.That((await (f1.GetEnumerableAsync())).ToList().Count, Is.EqualTo(0), "Invalid filtered results");
+				Assert.That((await (f2.GetEnumerableAsync())).ToList().Count, Is.EqualTo(1), "Invalid filtered results");
+			}
+		}
 	}
 }