Skip to content

Commit 3a00a30

Browse files
committed
Fix for NH3641
1 parent 500b433 commit 3a00a30

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System.Linq;
2+
using NHibernate.Engine;
13
using NHibernate.Linq.Visitors;
24
using Remotion.Linq;
35
using Remotion.Linq.Clauses;
@@ -12,12 +14,12 @@ internal interface IIsEntityDecider
1214

1315
public class AddJoinsReWriter : QueryModelVisitorBase, IIsEntityDecider
1416
{
15-
private readonly ISessionFactory _sessionFactory;
17+
private readonly ISessionFactoryImplementor _sessionFactory;
1618
private readonly SelectJoinDetector _selectJoinDetector;
1719
private readonly ResultOperatorAndOrderByJoinDetector _resultOperatorAndOrderByJoinDetector;
1820
private readonly WhereJoinDetector _whereJoinDetector;
1921

20-
private AddJoinsReWriter(ISessionFactory sessionFactory, QueryModel queryModel)
22+
private AddJoinsReWriter(ISessionFactoryImplementor sessionFactory, QueryModel queryModel)
2123
{
2224
_sessionFactory = sessionFactory;
2325
var joiner = new Joiner(queryModel);
@@ -26,7 +28,7 @@ private AddJoinsReWriter(ISessionFactory sessionFactory, QueryModel queryModel)
2628
_whereJoinDetector = new WhereJoinDetector(this, joiner);
2729
}
2830

29-
public static void ReWrite(QueryModel queryModel, ISessionFactory sessionFactory)
31+
public static void ReWrite(QueryModel queryModel, ISessionFactoryImplementor sessionFactory)
3032
{
3133
new AddJoinsReWriter(sessionFactory, queryModel).VisitQueryModel(queryModel);
3234
}
@@ -53,7 +55,7 @@ public override void VisitWhereClause(WhereClause whereClause, QueryModel queryM
5355

5456
public bool IsEntity(System.Type type)
5557
{
56-
return _sessionFactory.GetClassMetadata(type) != null;
58+
return _sessionFactory.GetImplementors(type.FullName).Any();
5759
}
5860

5961
public bool IsIdentifier(System.Type type, string propertyName)

0 commit comments

Comments
 (0)