Merge branch '5.2.x'

Author: fredericDelaporte

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.2.1.{build}
+version: 5.2.2.{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)' == ''">2</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

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.2" overwrite="false" />
+	<property name="project.version.numeric" value="5.2.2" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

releasenotes.txt

@@ -1,3 +1,18 @@
+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 +284,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/SecondLevelCacheTest/InvalidationTests.cs

@@ -15,6 +15,7 @@
 using NHibernate.Cache;
 using NHibernate.Cfg;
 using NHibernate.Impl;
+using NHibernate.Linq;
 using NHibernate.Test.SecondLevelCacheTests;
 using NSubstitute;
 using NUnit.Framework;
@@ -59,6 +60,7 @@ public async Task InvalidatesEntitiesAsync()
 
 			using (var session = OpenSession())
 			{
+				//Add Item
 				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
@@ -70,6 +72,7 @@ public async Task InvalidatesEntitiesAsync()
 					await (tx.CommitAsync());
 				}
 
+				//Update Item
 				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
@@ -81,6 +84,7 @@ public async Task InvalidatesEntitiesAsync()
 					await (tx.CommitAsync());
 				}
 
+				//Delete Item
 				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
@@ -91,13 +95,44 @@ public async Task InvalidatesEntitiesAsync()
 
 					await (tx.CommitAsync());
 				}
+
+				//Update Item using HQL
+				using (var tx = session.BeginTransaction())
+				{
+					await (session.CreateQuery("UPDATE Item SET Name='Test'").ExecuteUpdateAsync());
+
+					await (tx.CommitAsync());
+				}
+
+
+				//Update Item using LINQ
+				using (var tx = session.BeginTransaction())
+				{
+					await (session.Query<Item>()
+					       .UpdateBuilder()
+					       .Set(x => x.Name, "Test")
+					       .UpdateAsync(CancellationToken.None));
+
+					await (tx.CommitAsync());
+				}
+
+				//Update Item using SQL
+				using (var tx = session.BeginTransaction())
+				{
+					await (session.CreateSQLQuery("UPDATE Item SET Name='Test'")
+					       .AddSynchronizedQuerySpace("Item")
+					       .ExecuteUpdateAsync());
+
+					await (tx.CommitAsync());
+				}
 			}
 
-			//Should receive one preinvalidation and one invalidation per commit
+			//Should receive one preinvalidation per non-DML commit
 			Assert.That(preInvalidations, Has.Count.EqualTo(3));
 			Assert.That(preInvalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 
-			Assert.That(invalidations, Has.Count.EqualTo(3));
+			///...and one invalidation per commit
+			Assert.That(invalidations, Has.Count.EqualTo(6));
 			Assert.That(invalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 		}
 

src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs

@@ -5,6 +5,7 @@
 using NHibernate.Cache;
 using NHibernate.Cfg;
 using NHibernate.Impl;
+using NHibernate.Linq;
 using NHibernate.Test.SecondLevelCacheTests;
 using NSubstitute;
 using NUnit.Framework;
@@ -47,6 +48,7 @@ public void InvalidatesEntities()
 
 			using (var session = OpenSession())
 			{
+				//Add Item
 				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
@@ -58,6 +60,7 @@ public void InvalidatesEntities()
 					tx.Commit();
 				}
 
+				//Update Item
 				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
@@ -69,6 +72,7 @@ public void InvalidatesEntities()
 					tx.Commit();
 				}
 
+				//Delete Item
 				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
@@ -79,13 +83,44 @@ public void InvalidatesEntities()
 
 					tx.Commit();
 				}
+
+				//Update Item using HQL
+				using (var tx = session.BeginTransaction())
+				{
+					session.CreateQuery("UPDATE Item SET Name='Test'").ExecuteUpdate();
+
+					tx.Commit();
+				}
+
+
+				//Update Item using LINQ
+				using (var tx = session.BeginTransaction())
+				{
+					session.Query<Item>()
+					       .UpdateBuilder()
+					       .Set(x => x.Name, "Test")
+					       .Update();
+
+					tx.Commit();
+				}
+
+				//Update Item using SQL
+				using (var tx = session.BeginTransaction())
+				{
+					session.CreateSQLQuery("UPDATE Item SET Name='Test'")
+					       .AddSynchronizedQuerySpace("Item")
+					       .ExecuteUpdate();
+
+					tx.Commit();
+				}
 			}
 
-			//Should receive one preinvalidation and one invalidation per commit
+			//Should receive one preinvalidation per non-DML commit
 			Assert.That(preInvalidations, Has.Count.EqualTo(3));
 			Assert.That(preInvalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 
-			Assert.That(invalidations, Has.Count.EqualTo(3));
+			///...and one invalidation per commit
+			Assert.That(invalidations, Has.Count.EqualTo(6));
 			Assert.That(invalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 		}
 

src/NHibernate/Async/Engine/ActionQueue.cs

@@ -82,10 +82,6 @@ private async Task InnerExecuteAsync(IExecutable executable, CancellationToken c
 			}
 			finally
 			{
-				if (executable.PropertySpaces != null)
-				{
-					executedSpaces.UnionWith(executable.PropertySpaces);
-				}
 				RegisterCleanupActions(executable);
 			}
 		}

src/NHibernate/Engine/ActionQueue.cs

@@ -199,10 +199,6 @@ private void InnerExecute(IExecutable executable)
 			}
 			finally
 			{
-				if (executable.PropertySpaces != null)
-				{
-					executedSpaces.UnionWith(executable.PropertySpaces);
-				}
 				RegisterCleanupActions(executable);
 			}
 		}
@@ -221,6 +217,10 @@ private void RegisterCleanupActions(IExecutable executable)
 				RegisterProcess(executable.AfterTransactionCompletionProcess);
 #pragma warning restore 618,619
 			}
+			if (executable.PropertySpaces != null)
+			{
+				executedSpaces.UnionWith(executable.PropertySpaces);
+			}
 		}
 
 		/// <summary>