NH-3075 - Allow to use fetch with select

Author: rjperes

src/NHibernate.Test/Linq/EagerLoadTests.cs

@@ -8,6 +8,33 @@ namespace NHibernate.Test.Linq
 	[TestFixture]
 	public class EagerLoadTests : LinqTestCase
 	{
+		[Test]
+		public void CanSelectAndFetch()
+		{
+			//NH-3075
+			var result = db.Orders
+			  .Select(o => o.Customer)
+			  .Fetch(c => c.Orders)
+			  .ToList();
+
+			session.Close();
+
+			Assert.IsNotEmpty(result);
+			Assert.IsTrue(NHibernateUtil.IsInitialized(result[0].Orders));
+		}
+
+		[Test]
+		public void CanSelectAndFetchHql()
+		{
+			//NH-3075
+			var result = this.session.CreateQuery("select c from Order o left join o.Customer c left join fetch c.Orders").List<Customer>();
+
+			session.Close();
+
+			Assert.IsNotEmpty(result);
+			Assert.IsTrue(NHibernateUtil.IsInitialized(result[0].Orders));
+		}
+
 		[Test]
 		public void RelationshipsAreLazyLoadedByDefault()
 		{

src/NHibernate/Linq/Visitors/QuerySourceLocator.cs

@@ -1,5 +1,6 @@
 using Remotion.Linq;
 using Remotion.Linq.Clauses;
+using Remotion.Linq.Collections;
 
 namespace NHibernate.Linq.Visitors
 {
@@ -22,6 +23,20 @@ public static IQuerySource FindQuerySource(QueryModel queryModel, System.Type ty
             return finder._querySource;
         }
 
+		public override void VisitAdditionalFromClause(AdditionalFromClause fromClause, QueryModel queryModel, int index)
+		{
+			if (_type.IsAssignableFrom(fromClause.ItemType))
+			{
+				if (_querySource == null)
+				{
+					_querySource = fromClause;
+					return;
+				}
+			}
+
+			base.VisitAdditionalFromClause(fromClause, queryModel, index);
+		}
+
         public override void VisitMainFromClause(MainFromClause fromClause, QueryModel queryModel)
         {
             if (_type.IsAssignableFrom(fromClause.ItemType))