Merge branch 'master' into CacheFetch

Author: fredericDelaporte

Tools/packages.config

@@ -7,7 +7,7 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.9" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.13.1" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
   <package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
 </packages>

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

@@ -5,7 +5,7 @@
   <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>
@@ -24,7 +24,7 @@
     <PackageProjectUrl>http://nhibernate.info</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageReleaseNotes>https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

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/GhostProperty/GhostPropertyDynamicProxyFixture.cs

@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+// <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 NHibernate.Bytecode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.GhostProperty
+{
+	using System.Threading.Tasks;
+	// Since 5.3
+	[Obsolete]
+	[TestFixture]
+	public class GhostPropertyDynamicProxyFixtureAsync : GhostPropertyFixtureAsync
+	{
+		private string _originalProxyFactoryFactory;
+
+		protected override void Configure(Cfg.Configuration configuration)
+		{
+			base.Configure(configuration);
+			_originalProxyFactoryFactory = Cfg.Environment.BytecodeProvider.ProxyFactoryFactory.GetType().FullName;
+			configuration.SetProperty(Cfg.Environment.ProxyFactoryFactoryClass, typeof(DefaultProxyFactoryFactory).FullName);
+		}
+
+		protected override void DropSchema()
+		{
+			base.DropSchema();
+			// Reset IProxyFactoryFactory back to default
+			var injectableProxyFactory = (IInjectableProxyFactoryFactory) Cfg.Environment.BytecodeProvider;
+			injectableProxyFactory.SetProxyFactoryFactory(_originalProxyFactoryFactory);
+		}
+	}
+}

src/NHibernate.Test/Async/GhostProperty/GhostPropertyFixture.cs

@@ -47,6 +47,11 @@ protected override void OnSetUp()
 					Id = 1
 				};
 				s.Persist(wireTransfer);
+				var creditCard = new CreditCard
+				{
+					Id = 2
+				};
+				s.Persist(creditCard);
 				s.Persist(new Order
 				{
 					Id = 1,
@@ -89,6 +94,71 @@ public async Task CanGetActualValueFromLazyManyToOneAsync()
 			}
 		}
 
+		[Test]
+		public async Task CanGetInitializedLazyManyToOneAfterClosedSessionAsync()
+		{
+			Order order;
+			Payment payment;
+
+			using (var s = OpenSession())
+			{
+				order = await (s.GetAsync<Order>(1));
+				payment = order.Payment; // Initialize Payment
+			}
+
+			Assert.That(order.Payment, Is.EqualTo(payment));
+			Assert.That(order.Payment is WireTransfer, Is.True);
+		}
+
+		[Test]
+		public async Task InitializedLazyManyToOneBeforeParentShouldNotBeAProxyAsync()
+		{
+			Order order;
+			Payment payment;
+
+			using (var s = OpenSession())
+			{
+				payment = await (s.LoadAsync<Payment>(1));
+				await (NHibernateUtil.InitializeAsync(payment));
+				order = await (s.GetAsync<Order>(1));
+				// Here the Payment property should be unwrapped
+				payment = order.Payment;
+			}
+
+			Assert.That(order.Payment, Is.EqualTo(payment));
+			Assert.That(order.Payment is WireTransfer, Is.True);
+		}
+
+		[Test]
+		public async Task SetUninitializedProxyShouldNotTriggerPropertyInitializationAsync()
+		{
+			using (var s = OpenSession())
+			{
+				var order = await (s.GetAsync<Order>(1));
+				Assert.That(order.Payment is WireTransfer, Is.True); // Load property
+				Assert.That(NHibernateUtil.IsPropertyInitialized(order, "Payment"), Is.True);
+				order.Payment = await (s.LoadAsync<Payment>(2));
+				Assert.That(NHibernateUtil.IsPropertyInitialized(order, "Payment"), Is.True);
+				Assert.That(NHibernateUtil.IsInitialized(order.Payment), Is.False);
+				Assert.That(order.Payment is WireTransfer, Is.False);
+			}
+		}
+
+		[Test]
+		public async Task SetInitializedProxyShouldNotResetPropertyInitializationAsync()
+		{
+			using (var s = OpenSession())
+			{
+				var order = await (s.GetAsync<Order>(1));
+				var payment = await (s.LoadAsync<Payment>(2));
+				Assert.That(order.Payment is WireTransfer, Is.True); // Load property
+				Assert.That(NHibernateUtil.IsPropertyInitialized(order, "Payment"), Is.True);
+				await (NHibernateUtil.InitializeAsync(payment));
+				order.Payment = payment;
+				Assert.That(NHibernateUtil.IsPropertyInitialized(order, "Payment"), Is.True);
+			}
+		}
+
 		[Test]
 		public async Task WillNotLoadGhostPropertyByDefaultAsync()
 		{
@@ -183,5 +253,18 @@ public async Task AcceptPropertySetWithTransientObjectAsync()
 
 			Assert.That(order.Payment, Is.EqualTo(newPayment));
 		}
+
+		[Test]
+		public async Task WillFetchJoinInSingleHqlQueryAsync()
+		{
+			Order order = null;
+
+			using (ISession s = OpenSession())
+			{
+				order = (await (s.CreateQuery("from Order o left join fetch o.Payment where o.Id = 1").ListAsync<Order>()))[0];
+			}
+
+			Assert.DoesNotThrow(() => { var x = order.Payment; });
+		}
 	}
 }

src/NHibernate.Test/Async/LazyOneToOne/LazyOneToOneTest.cs

@@ -78,8 +78,8 @@ public async Task LazyAsync()
 
 			s = OpenSession();
 			t = s.BeginTransaction();
-			p = await (s.GetAsync<Person>("Gavin"));
-			Assert.That(!NHibernateUtil.IsPropertyInitialized(p, "Employee"));
+			p = await (s.GetAsync<Person>("Gavin")); // The default loader will fetch the employee
+			Assert.That(NHibernateUtil.IsPropertyInitialized(p, "Employee"));
 
 			Assert.That(p.Employee.Person, Is.SameAs(p));
 			Assert.That(NHibernateUtil.IsInitialized(p.Employee.Employments));
@@ -95,4 +95,4 @@ public async Task LazyAsync()
 			s.Close();
 		}
 	}
-}
+}