Inject into CriteriaLoader info about projected entities

Author: bahusoid

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

@@ -191,6 +191,54 @@ public async Task AliasedEntityProjectionAsync()
 			}
 		}
 
+		[Test]
+		public async Task EntityProjectionAsSelectExpressionAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntitySimpleChild child1 = null;
+				child1 = await (session
+					.QueryOver<EntityComplex>()
+					.JoinAlias(ep => ep.Child1, () => child1)
+					.Select(ec => child1.AsEntity())
+					.Take(1).SingleOrDefaultAsync<EntitySimpleChild>());
+
+				Assert.That(child1, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(child1), Is.True, "Object must be initialized");
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
+		[Test]
+		public async Task EntityProjectionLockModeAsync()
+		{
+			var upgradeHint = Dialect.ForUpdateString;
+			if(string.IsNullOrEmpty(upgradeHint))
+				upgradeHint = this.Dialect.AppendLockHint(LockMode.Upgrade, string.Empty);
+			if (string.IsNullOrEmpty(upgradeHint))
+			{
+				Assert.Ignore($"Upgrade hint is not supported by dialect {Dialect.GetType().Name}");
+			}
+
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntitySimpleChild child1 = null;
+				child1 = await (session
+					.QueryOver<EntityComplex>()
+					.JoinAlias(ep => ep.Child1, () => child1)
+					.Lock(() => child1).Upgrade
+					.Select(Projections.Entity(() => child1))
+					.Take(1).SingleOrDefaultAsync<EntitySimpleChild>());
+				
+				Assert.That(child1, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(child1), Is.True, "Object must be initialized");
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+				Assert.That(sqlLog.Appender.GetEvents()[0].RenderedMessage, Does.Contain(upgradeHint));
+			}
+		}
+
 		[Test]
 		public async Task MultipleLazyEntityProjectionsAsync()
 		{
@@ -313,6 +361,7 @@ class MultipleEntitiesResult
 			public EntitySimpleChild Child2 { get; set; }
 			public EntityComplex SameAsRootChild { get; set; }
 			public EntitySimpleChild NullListElem { get; set; }
+			public string Name { get; set; }
 		}
 
 		[Test]
@@ -335,9 +384,11 @@ public async Task MultipleEntitiesProjectionsToResultTransformerAsync()
 					.JoinAlias(ep => ep.SameTypeChild, () => sameAsRootChild)
 					.JoinAlias(ep => ep.ChildrenList, () => nullListElem, JoinType.LeftOuterJoin)
 					.Select(
-						Projections.Alias(Projections.RootEntity(), nameof(r.Root)),
+						Projections.RootEntity().WithAlias(nameof(r.Root)),
 						Projections.Entity(() => child1),
+						Projections.Property(() => child2.Name).As(nameof(r.Name)),
 						Projections.Entity(() => child2),
+						Projections.Property(() => child1.Id),
 						Projections.Entity(() => sameAsRootChild),
 						Projections.Entity(() => nullListElem)
 					)
@@ -362,7 +413,8 @@ public async Task ReadOnlyProjectionAsync()
 			{
 				EntityComplex entityRoot = await (session
 					.QueryOver<EntityComplex>()
-					.Select(Projections.RootEntity().SetReadonly(true))
+					.Select(Projections.RootEntity())
+					.ReadOnly()
 					.Take(1).SingleOrDefaultAsync());
 
 				Assert.That(session.IsReadOnly(entityRoot), Is.True, "Object must be loaded readonly.");

src/NHibernate.Test/Criteria/EntityProjectionsTest.cs

@@ -180,6 +180,54 @@ public void AliasedEntityProjection()
 			}
 		}
 
+		[Test]
+		public void EntityProjectionAsSelectExpression()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntitySimpleChild child1 = null;
+				child1 = session
+					.QueryOver<EntityComplex>()
+					.JoinAlias(ep => ep.Child1, () => child1)
+					.Select(ec => child1.AsEntity())
+					.Take(1).SingleOrDefault<EntitySimpleChild>();
+
+				Assert.That(child1, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(child1), Is.True, "Object must be initialized");
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
+		[Test]
+		public void EntityProjectionLockMode()
+		{
+			var upgradeHint = Dialect.ForUpdateString;
+			if(string.IsNullOrEmpty(upgradeHint))
+				upgradeHint = this.Dialect.AppendLockHint(LockMode.Upgrade, string.Empty);
+			if (string.IsNullOrEmpty(upgradeHint))
+			{
+				Assert.Ignore($"Upgrade hint is not supported by dialect {Dialect.GetType().Name}");
+			}
+
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntitySimpleChild child1 = null;
+				child1 = session
+					.QueryOver<EntityComplex>()
+					.JoinAlias(ep => ep.Child1, () => child1)
+					.Lock(() => child1).Upgrade
+					.Select(Projections.Entity(() => child1))
+					.Take(1).SingleOrDefault<EntitySimpleChild>();
+				
+				Assert.That(child1, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(child1), Is.True, "Object must be initialized");
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+				Assert.That(sqlLog.Appender.GetEvents()[0].RenderedMessage, Does.Contain(upgradeHint));
+			}
+		}
+
 		[Test]
 		public void MultipleLazyEntityProjections()
 		{
@@ -302,6 +350,7 @@ class MultipleEntitiesResult
 			public EntitySimpleChild Child2 { get; set; }
 			public EntityComplex SameAsRootChild { get; set; }
 			public EntitySimpleChild NullListElem { get; set; }
+			public string Name { get; set; }
 		}
 
 		[Test]
@@ -324,9 +373,11 @@ public void MultipleEntitiesProjectionsToResultTransformer()
 					.JoinAlias(ep => ep.SameTypeChild, () => sameAsRootChild)
 					.JoinAlias(ep => ep.ChildrenList, () => nullListElem, JoinType.LeftOuterJoin)
 					.Select(
-						Projections.Alias(Projections.RootEntity(), nameof(r.Root)),
+						Projections.RootEntity().WithAlias(nameof(r.Root)),
 						Projections.Entity(() => child1),
+						Projections.Property(() => child2.Name).As(nameof(r.Name)),
 						Projections.Entity(() => child2),
+						Projections.Property(() => child1.Id),
 						Projections.Entity(() => sameAsRootChild),
 						Projections.Entity(() => nullListElem)
 					)
@@ -351,7 +402,8 @@ public void ReadOnlyProjection()
 			{
 				EntityComplex entityRoot = session
 					.QueryOver<EntityComplex>()
-					.Select(Projections.RootEntity().SetReadonly(true))
+					.Select(Projections.RootEntity())
+					.ReadOnly()
 					.Take(1).SingleOrDefault();
 
 				Assert.That(session.IsReadOnly(entityRoot), Is.True, "Object must be loaded readonly.");