Support caching queries with autodiscovered types

src/NHibernate.Test/Async/QueryTest/MultiCriteriaFixture.cs

@@ -153,7 +153,8 @@ public async Task CanGetMultiQueryFromSecondLevelCacheAsync()
 
 			var cacheHashtable = MultipleQueriesFixtureAsync.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			var cachedQuery = (IList)cachedListEntry[1];
+			// The first element is a timestamp, the second is aliases, then only we have the cached data.
+			var cachedQuery = (IList)cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/Async/QueryTest/MultipleMixedQueriesFixture.cs

@@ -83,7 +83,8 @@ public async Task CanGetMultiQueryFromSecondLevelCacheAsync()
 
 			var cacheHashtable = MultipleQueriesFixtureAsync.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			var cachedQuery = (IList)cachedListEntry[1];
+			// The first element is a timestamp, the second is aliases, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/Async/QueryTest/MultipleQueriesFixture.cs

@@ -86,7 +86,8 @@ public async Task CanGetMultiQueryFromSecondLevelCacheAsync()
 
 			var cacheHashtable = GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			var cachedQuery = (IList)cachedListEntry[1];
+			// The first element is a timestamp, the second is aliases, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/Async/SqlTest/Query/NativeSQLQueriesFixture.cs

@@ -10,9 +10,10 @@
 
 using System.Collections;
 using System.Linq;
+using NHibernate.Criterion;
+using NHibernate.Multi;
 using NHibernate.Transform;
 using NUnit.Framework;
-using NHibernate.Criterion;
 
 namespace NHibernate.Test.SqlTest.Query
 {
@@ -62,6 +63,20 @@ protected override string MappingsAssembly
 			get { return "NHibernate.Test"; }
 		}
 
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from Employment").ExecuteUpdate();
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+
+			Sfi.QueryCache.Clear();
+		}
+
 		[Test]
 		public async Task FailOnNoAddEntityOrScalarAsync()
 		{
@@ -136,18 +151,6 @@ public async Task SQLQueryInterfaceAsync()
 				await (t.CommitAsync());
 				s.Close();
 			}
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				await (s.DeleteAsync(emp));
-				await (s.DeleteAsync(gavin));
-				await (s.DeleteAsync(ifa));
-				await (s.DeleteAsync(jboss));
-
-				await (t.CommitAsync());
-				s.Close();
-			}
 		}
 
 		[Test]
@@ -202,18 +205,6 @@ public async Task SQLQueryInterfaceCacheableAsync()
 				await (t.CommitAsync());
 				s.Close();
 			}
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				await (s.DeleteAsync(emp));
-				await (s.DeleteAsync(gavin));
-				await (s.DeleteAsync(ifa));
-				await (s.DeleteAsync(jboss));
-
-				await (t.CommitAsync());
-				s.Close();
-			}
 		}
 
 		[Test(Description = "GH-2904")]
@@ -270,20 +261,11 @@ Task<IList> GetCacheableSqlQueryResultsAsync()
 					Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1), "results are expected from cache");
 				}
 			}
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				await (s.DeleteAsync(emp));
-				await (s.DeleteAsync(gavin));
-				await (s.DeleteAsync(ifa));
-				await (s.DeleteAsync(jboss));
-				await (t.CommitAsync());
-			}
 		}
 
 		class ResultDto
 		{
+			public long orgId { get; set; }
 			public string regionCode { get; set; }
 		}
 
@@ -312,23 +294,64 @@ async Task AssertQueryAsync(bool fromCache)
 							.ListAsync());
 					await (t.CommitAsync());
 
-					Assert.AreEqual(1, l.Count);
-					//TODO: Uncomment if we properly fix caching auto discovery type queries with transformers
-					// var msg = "results are expected from " + (fromCache ? "cache" : "DB");
-					// Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(fromCache ? 0 : 1), msg);
-					// Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(fromCache ? 1 : 0), msg);
+					Assert.That(l.Count, Is.EqualTo(1));
+					var msg = "Results are expected from " + (fromCache ? "cache" : "DB");
+					Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(fromCache ? 0 : 1), msg);
+					Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(fromCache ? 1 : 0), msg);
 				}
 			}
 
 			await (AssertQueryAsync(false));
 			await (AssertQueryAsync(true));
+		}
 
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
+		[Test(Description = "GH-3169")]
+		public async Task CacheableScalarSQLMultiQueryWithTransformerAsync()
+		{
+			Organization ifa = new Organization("IFA");
+
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
 			{
-				await (s.DeleteAsync(ifa));
+				await (s.SaveAsync(ifa));
 				await (t.CommitAsync());
 			}
+
+			async Task AssertQueryAsync(bool fromCache)
+			{
+				using (var s = OpenSession())
+				using (var t = s.BeginTransaction())
+				using (EnableStatisticsScope())
+				{
+					var q1 = s.CreateSQLQuery("select org.NAME as regionCode from ORGANIZATION org")
+							.AddScalar("regionCode", NHibernateUtil.String)
+							.SetResultTransformer(Transformers.AliasToBean<ResultDto>())
+							.SetCacheable(true);
+					var q2 = s.CreateSQLQuery("select org.ORGID as orgId from ORGANIZATION org")
+							.AddScalar("orgId", NHibernateUtil.Int64)
+							.SetResultTransformer(Transformers.AliasToBean<ResultDto>())
+							.SetCacheable(true);
+
+					var batch = s.CreateQueryBatch();
+					batch.Add<ResultDto>(q1);
+					batch.Add<ResultDto>(q2);
+					await (batch.ExecuteAsync());
+
+					var l1 = await (batch.GetResultAsync<ResultDto>(0));
+					var l2 = await (batch.GetResultAsync<ResultDto>(1));
+
+					await (t.CommitAsync());
+
+					Assert.That(l1.Count, Is.EqualTo(1), "Unexpected results count for the first query.");
+					Assert.That(l2.Count, Is.EqualTo(1), "Unexpected results count for the second query.");
+					var msg = "Results are expected from " + (fromCache ? "cache" : "DB");
+					Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(fromCache ? 0 : 2), msg);
+					Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(fromCache ? 2 : 0), msg);
+				}
+			}
+
+			await (AssertQueryAsync(false));
+			await (AssertQueryAsync(true));
 		}
 
 		[Test]
@@ -356,11 +379,6 @@ public async Task ResultSetMappingDefinitionAsync()
 			     .ListAsync());
 			Assert.AreEqual(l.Count, 1);
 
-			await (s.DeleteAsync(emp));
-			await (s.DeleteAsync(gavin));
-			await (s.DeleteAsync(ifa));
-			await (s.DeleteAsync(jboss));
-
 			await (t.CommitAsync());
 			s.Close();
 		}
@@ -443,8 +461,6 @@ public async Task ScalarValuesAsync()
 			Assert.AreEqual(o[1], "JBoss");
 			Assert.AreEqual(o[0], idJBoss);
 
-			await (s.DeleteAsync(ifa));
-			await (s.DeleteAsync(jboss));
 			await (t.CommitAsync());
 			s.Close();
 		}

src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs

@@ -141,7 +141,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
 
 			var cacheHashtable = MultipleQueriesFixture.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			var cachedQuery = (IList)cachedListEntry[1];
+			// The first element is a timestamp, the second is aliases, then only we have the cached data.
+			var cachedQuery = (IList)cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultipleMixedQueriesFixture.cs

@@ -71,7 +71,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
 
 			var cacheHashtable = MultipleQueriesFixture.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			var cachedQuery = (IList)cachedListEntry[1];
+			// The first element is a timestamp, the second is aliases, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs

@@ -74,7 +74,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
 
 			var cacheHashtable = GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			var cachedQuery = (IList)cachedListEntry[1];
+			// The first element is a timestamp, the second is aliases, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();