Merge branch 'master' into JoinSubQueryHql

Author: bahusoid

releasenotes.txt

@@ -1,4 +1,21 @@
-Build 5.3.13
+Build 5.3.14
+=============================
+
+Release notes - NHibernate - Version 5.3.14
+
+3 issues were resolved in this release.
+
+** Bug
+
+    #3169 InvalidOperationException: This transformer is not initialized by Cached Query
+    #3164 Fetching a lazy loaded component regression
+
+** Task
+
+   * #3183 Release 5.3.14
+
+
+Build 5.3.13
 =============================
 
 Release notes - NHibernate - Version 5.3.13

src/NHibernate.Test/Any/AnyTypeTest.cs

@@ -15,11 +15,6 @@ protected override string[] Mappings
 			get { return new string[] {"Any.Person.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public void FlushProcessing()
 		{

src/NHibernate.Test/Async/Any/AnyTypeTest.cs

@@ -26,11 +26,6 @@ protected override string[] Mappings
 			get { return new string[] {"Any.Person.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public async Task FlushProcessingAsync()
 		{

src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs

@@ -25,6 +25,8 @@ namespace NHibernate.Test.BulkManipulation
 	[TestFixture]
 	public class NativeSQLBulkOperationsWithCacheAsync : TestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override string MappingsAssembly => "NHibernate.Test";
 
 		protected override string[] Mappings => new[] { "BulkManipulation.Vehicle.hbm.xml" };

src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

@@ -44,8 +44,6 @@ public BatchableCacheFixtureAsync(BatchFetchStyle fetchStyle)
 
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/Async/CacheTest/BuildCacheFixture.cs

@@ -29,9 +29,6 @@ public class BuildCacheFixtureAsync : TestCase
 
 		protected override string[] Mappings => new[] { "CacheTest.EntitiesInSameRegion.hbm.xml" };
 
-		// Disable the TestCase cache overrides.
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseQueryCache, "true");

src/NHibernate.Test/Async/CacheTest/CacheFixture.cs

@@ -22,7 +22,7 @@ namespace NHibernate.Test.CacheTest
 	public class CacheFixtureAsync: TestCase
 	{
 		[Test]
-		public async Task TestSimpleCacheAsync()
+		public async Task TestSimpleReadWriteCacheAsync()
 		{
 			await (DoTestCacheAsync(new HashtableCacheProvider()));
 		}
@@ -57,7 +57,8 @@ protected CacheKey CreateCacheKey(string text)
 
 			Assert.IsNull(await (ccs.GetAsync(fooKey, longBefore, cancellationToken)));
 			Assert.AreEqual("foo", await (ccs.GetAsync(fooKey, after, cancellationToken)));
-			Assert.IsFalse(await (ccs.PutAsync(fooKey, "foo", before, null, null, false, cancellationToken)));
+			Assert.IsFalse(await (ccs.PutAsync(fooKey, "foo", before, null, null, true, cancellationToken)));
+			Assert.IsTrue(await (ccs.PutAsync(fooKey, "foo", before, null, null, false, cancellationToken)));
 
 			// update it;
 

src/NHibernate.Test/Async/CacheTest/SerializingCacheFixture.cs

@@ -28,8 +28,6 @@ public class SerializingCacheFixtureAsync : TestCase
 
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Environment.UseSecondLevelCache, "true");

src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs

@@ -38,11 +38,6 @@ protected override string[] Mappings
 			}
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			// Order uses a scalar sub-select formula.

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

@@ -32,6 +32,8 @@ public class SelectModeTestAsync : TestCaseMappingByCode
 	{
 		private Guid _parentEntityComplexId;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		[Test]
 		public async Task SelectModeJoinOnlyAsync()
 		{