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()
 		{

src/NHibernate.Test/Async/Extralazy/ExtraLazyFixture.cs

@@ -32,11 +32,6 @@ protected override string[] Mappings
 			get { return new[] {"Extralazy.UserGroup.hbm.xml"}; }
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		protected override void Configure(Configuration configuration)
 		{
 			configuration.SetProperty(Cfg.Environment.GenerateStatistics, "true");

src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs

@@ -25,6 +25,8 @@ namespace NHibernate.Test.FetchLazyProperties
 	[TestFixture]
 	public class FetchLazyPropertiesFixtureAsync : TestCase
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override string MappingsAssembly
 		{
 			get { return "NHibernate.Test"; }

src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs

@@ -28,6 +28,8 @@ public class DynamicFilterTestAsync : TestCase
 		private static readonly ILog log = LogManager.GetLogger(typeof(DynamicFilterTestAsync));
 		private TestData testData;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void OnSetUp()
 		{
 			testData = new TestData(this);

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

@@ -20,6 +20,8 @@ namespace NHibernate.Test.Futures
 	[TestFixture]
 	public class LinqFutureFixtureAsync : FutureFixture
 	{
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		protected override void OnTearDown()
 		{
 			using (var session = OpenSession())

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

@@ -28,6 +28,8 @@ public class QueryBatchFixtureAsync : TestCaseMappingByCode
 		private Guid _parentId;
 		private Guid _eagerId;
 
+		protected override string CacheConcurrencyStrategy => "nonstrict-read-write";
+
 		[Test]
 		public async Task CanCombineCriteriaAndHqlInFutureAsync()
 		{

src/NHibernate.Test/Async/GeneratedTest/TriggerGeneratedValuesWithoutCachingTest.cs

@@ -30,10 +30,5 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect is MsSql2000Dialect || dialect is Oracle8iDialect;
 		}
-
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
 	}
 }

src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs

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

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

@@ -41,11 +41,6 @@ protected override void Configure(Cfg.Configuration configuration)
 			configuration.SetProperty(Environment.UseSecondLevelCache, "false");
 		}
 
-		protected override string CacheConcurrencyStrategy
-		{
-			get { return null; }
-		}
-
 		[Test]
 		public async Task LazyAsync()
 		{

src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs

@@ -36,8 +36,6 @@ protected override string[] Mappings
 			get { return new[] { "LazyProperty.Mappings.hbm.xml" }; }
 		}
 
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override DebugSessionFactory BuildSessionFactory()
 		{
 			using (var logSpy = new LogSpy(typeof(EntityMetamodel)))

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

@@ -19,9 +19,6 @@ namespace NHibernate.Test.NHSpecificTest.GH1754
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
-		// Disable second level cache
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void OnSetUp()
 		{
 			Sfi.Statistics.IsStatisticsEnabled = true;

src/NHibernate.Test/Async/NHSpecificTest/GH1756/UnsavedValueNoneFixture.cs

@@ -19,9 +19,6 @@ namespace NHibernate.Test.NHSpecificTest.GH1756
 	[TestFixture]
 	public class UnsavedValueNoneFixtureAsync : BugTestCase
 	{
-		// disable second level cache enabled by default by the base class.
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void OnSetUp()
 		{
 			using (var session = OpenSession())

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

@@ -23,12 +23,11 @@ namespace NHibernate.Test.NHSpecificTest.GH2552
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
-		protected override string CacheConcurrencyStrategy => null;
-
 		protected override void Configure(NHCfg.Configuration configuration)
 		{
 			configuration.SetProperty(NHCfg.Environment.UseSecondLevelCache, "true");
 			configuration.SetProperty(NHCfg.Environment.GenerateStatistics, "true");
+			configuration.SetProperty(NHCfg.Environment.UseMinimalPuts, "true");
 		}
 
 		protected override void OnTearDown()

src/NHibernate.Test/Async/NHSpecificTest/GH3164/FixtureByCode.cs

@@ -0,0 +1,66 @@
+//------------------------------------------------------------------------------
+// <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.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.GH3164
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class ByCodeFixtureAsync : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.AddMapping<ContentItemMapping>();
+			mapper.AddMapping<HeadMapping>();
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new ContentItem { Name = "Test" };
+				session.Save(e1);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task FetchComponentAsync()
+		{
+			using (var session = OpenSession())
+			{
+				var result = await (session.Query<ContentItem>().Fetch(i => i.Head).ToListAsync());
+
+				Assert.That(result.Count, Is.EqualTo(1));
+			}
+		}
+	}
+}