Improve select clause transformation for Linq provider

Author: maca88

src/NHibernate.DomainModel/Northwind/Entities/Animal.cs

@@ -12,7 +12,8 @@ public class Animal
         public virtual Animal Father { get; set; }
         public virtual IList<Animal> Children { get; set; }
         public virtual string SerialNumber { get; set; }
-
+		public virtual string FatherSerialNumber => Father?.SerialNumber;
+		public virtual bool HasFather => Father != null;
 		public virtual Animal FatherOrMother => Father ?? Mother;
 	}
 

src/NHibernate.DomainModel/Northwind/Entities/Role.cs

@@ -7,5 +7,6 @@ public class Role
 		public virtual bool IsActive { get; set; }
 		public virtual AnotherEntity Entity { get; set; }
 		public virtual Role ParentRole { get; set; }
+		public virtual User CreatedBy { get; set; } // Not mapped
 	}
 }

src/NHibernate.DomainModel/Northwind/Entities/UserComponent.cs

@@ -5,10 +5,14 @@ public class UserComponent
         public string Property1 { get; set; }
         public string Property2 { get; set; }
         public UserComponent2 OtherComponent { get; set; }
+
+		public string Property3 => $"{Property1}{Property2}";
     }
 
     public class UserComponent2
     {
         public string OtherProperty1 { get; set; }
+
+		public string OtherProperty2 => OtherProperty1;
     }
-}
+}

src/NHibernate.DomainModel/Northwind/Entities/UserDto.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace NHibernate.DomainModel.Northwind.Entities
 {
@@ -9,11 +10,13 @@ public class UserDto
 		public virtual int InvalidLoginAttempts { get; set; }
 		public virtual string RoleName { get; set; }
 		public virtual UserDto2 Dto2 { get; set; }
+		public virtual List<UserDto2> Dto2List { get; set; } = new List<UserDto2>();
 
 		public UserDto(int id, string name)
 		{
 			Id = id;
 			Name = name;
+			Dto2 = new UserDto2();
 		}
 	}
 

src/NHibernate.Test/Async/Linq/SelectionTests.cs

@@ -9,12 +9,15 @@
 
 
 using System.Collections;
+using System.Linq;
 using NHibernate.Dialect;
 using NUnit.Framework;
+using NHibernate.Linq;
 
 namespace NHibernate.Test.TypedManyToOne
 {
 	using System.Threading.Tasks;
+	using System.Threading;
 	[TestFixture]
 	public class TypedManyToOneTestAsync : TestCase
 	{
@@ -35,38 +38,27 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		}
 
 		[Test]
-		public async Task TestCreateQueryAsync()
+		public async Task TestLinqEntityNameQueryAsync()
 		{
-			var cust = new Customer();
-			cust.CustomerId = "abc123";
-			cust.Name = "Matt";
-
-			var ship = new Address();
-			ship.Street = "peachtree rd";
-			ship.State = "GA";
-			ship.City = "ATL";
-			ship.Zip = "30326";
-			ship.AddressId = new AddressId("SHIPPING", "xyz123");
-			ship.Customer = cust;
-
-			var bill = new Address();
-			bill.Street = "peachtree rd";
-			bill.State = "GA";
-			bill.City = "ATL";
-			bill.Zip = "30326";
-			bill.AddressId = new AddressId("BILLING", "xyz123");
-			bill.Customer = cust;
-
-			cust.BillingAddress = bill;
-			cust.ShippingAddress = ship;
-
-			using (ISession s = Sfi.OpenSession())
-			using (ITransaction t = s.BeginTransaction())
+			var cust = await (CreateCustomerAsync());
+			using (var s = Sfi.OpenSession())
+			using (var t = s.BeginTransaction())
 			{
-				await (s.PersistAsync(cust));
+				var billingNotes = await (s.Query<Customer>().Select(o => o.BillingAddress.BillingNotes).FirstAsync());
+				Assert.That(billingNotes, Is.EqualTo("BillingNotes"));
+				var shippingNotes = await (s.Query<Customer>().Select(o => o.ShippingAddress.ShippingNotes).FirstAsync());
+				Assert.That(shippingNotes, Is.EqualTo("ShippingNotes"));
+
 				await (t.CommitAsync());
 			}
 
+			await (DeleteCustomerAsync(cust));
+		}
+
+		[Test]
+		public async Task TestCreateQueryAsync()
+		{
+			var cust = await (CreateCustomerAsync());
 			using (ISession s = Sfi.OpenSession())
 			using (ITransaction t = s.BeginTransaction())
 			{
@@ -82,20 +74,7 @@ public async Task TestCreateQueryAsync()
 				await (t.CommitAsync());
 			}
 
-			using (ISession s = Sfi.OpenSession())
-			using (ITransaction t = s.BeginTransaction())
-			{
-				await (s.SaveOrUpdateAsync(cust));
-				ship = cust.ShippingAddress;
-				cust.ShippingAddress = null;
-				await (s.DeleteAsync("ShippingAddress", ship));
-				await (s.FlushAsync());
-
-				Assert.That(await (s.GetAsync("ShippingAddress", ship.AddressId)), Is.Null);
-				await (s.DeleteAsync(cust));
-
-				await (t.CommitAsync());
-			}
+			await (DeleteCustomerAsync(cust));
 		}
 
 		[Test]
@@ -124,5 +103,60 @@ public async Task TestCreateQueryNullAsync()
 				await (t.CommitAsync());
 			}
 		}
+
+		private async Task<Customer> CreateCustomerAsync(CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var cust = new Customer();
+			cust.CustomerId = "abc123";
+			cust.Name = "Matt";
+
+			var ship = new Address();
+			ship.Street = "peachtree rd";
+			ship.State = "GA";
+			ship.City = "ATL";
+			ship.Zip = "30326";
+			ship.AddressId = new AddressId("SHIPPING", "xyz123");
+			ship.Customer = cust;
+			ship.ShippingNotes = "ShippingNotes";
+
+			var bill = new Address();
+			bill.Street = "peachtree rd";
+			bill.State = "GA";
+			bill.City = "ATL";
+			bill.Zip = "30326";
+			bill.AddressId = new AddressId("BILLING", "xyz123");
+			bill.Customer = cust;
+			bill.BillingNotes = "BillingNotes";
+
+			cust.BillingAddress = bill;
+			cust.ShippingAddress = ship;
+
+			using (ISession s = Sfi.OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				await (s.PersistAsync(cust, cancellationToken));
+				await (t.CommitAsync(cancellationToken));
+			}
+
+			return cust;
+		}
+
+		private async Task DeleteCustomerAsync(Customer cust, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			using (var s = Sfi.OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				await (s.SaveOrUpdateAsync(cust, cancellationToken));
+				var ship = cust.ShippingAddress;
+				cust.ShippingAddress = null;
+				await (s.DeleteAsync("ShippingAddress", ship, cancellationToken));
+				await (s.FlushAsync(cancellationToken));
+
+				Assert.That(await (s.GetAsync("ShippingAddress", ship.AddressId, cancellationToken)), Is.Null);
+				await (s.DeleteAsync(cust, cancellationToken));
+
+				await (t.CommitAsync(cancellationToken));
+			}
+		}
 	}
 }