[Nhibernate-commit] SF.net SVN: nhibernate:[5125] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5125
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5125&view=rev
Author:   fabiomaulo
Date:     2010-08-07 17:24:50 +0000 (Sat, 07 Aug 2010)

Log Message:
-----------
Fix NH-2277

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Linq/Visitors/QuerySourceLocator.cs
    trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs

Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/QuerySourceLocator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Linq/Visitors/QuerySourceLocator.cs	2010-08-07 16:51:50 UTC (rev 5124)
+++ trunk/nhibernate/src/NHibernate/Linq/Visitors/QuerySourceLocator.cs	2010-08-07 17:24:50 UTC (rev 5125)
@@ -24,7 +24,7 @@
 
         public override void VisitMainFromClause(MainFromClause fromClause, QueryModel queryModel)
         {
-            if (_type == fromClause.ItemType)
+            if (_type.IsAssignableFrom(fromClause.ItemType))
             {
                 _querySource = fromClause;
             }

Modified: trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs	2010-08-07 16:51:50 UTC (rev 5124)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs	2010-08-07 17:24:50 UTC (rev 5125)
@@ -1,6 +1,8 @@
 using System.Linq;
 using NHibernate.Linq;
+using NHibernate.Test.Linq.Entities;
 using NUnit.Framework;
+using SharpTestsEx;
 
 namespace NHibernate.Test.Linq
 {
@@ -53,5 +55,13 @@
             Assert.IsTrue(NHibernateUtil.IsInitialized(x[0].Orders));
             Assert.IsTrue(NHibernateUtil.IsInitialized(x[0].Orders.First().OrderLines));
         }
+
+				[Test]
+				public void WhenFetchSuperclassCollectionThenNotThrows()
+				{
+					// NH-2277
+					session.Executing(s => s.Query<Lizard>().Fetch(x => x.Children).ToList()).NotThrows();
+					session.Close();
+				} 
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.