From 7a8d11c36850f5c9f73fc2a4b64127b2c7a92f01 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Fri, 14 Aug 2020 06:58:05 +0300 Subject: [PATCH 1/2] Throw entity not mapped exception for entity join if possible --- src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs index 32c7f88d15a..fe3f28692de 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs @@ -794,7 +794,8 @@ private IQueryable ResolveEntityJoinReferencedPersister(IASTNode path) if (path.Type == IDENT) { var pathIdentNode = (IdentNode) path; - return SessionFactoryHelper.FindQueryableUsingImports(pathIdentNode.Path); + //Until IDENT node is not expected for implicit join path we can throw on not found persister + return (IQueryable) SessionFactoryHelper.RequireClassPersister(pathIdentNode.Path); } else if (path.Type == DOT) { From 7d4d72d260155e65bf066dd4d87088c20c70a0fe Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Sun, 16 Aug 2020 21:34:41 +0300 Subject: [PATCH 2/2] Code review changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédéric Delaporte <12201973+fredericDelaporte@users.noreply.github.com> --- src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs index fe3f28692de..e75da1bf7c7 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs @@ -794,7 +794,7 @@ private IQueryable ResolveEntityJoinReferencedPersister(IASTNode path) if (path.Type == IDENT) { var pathIdentNode = (IdentNode) path; - //Until IDENT node is not expected for implicit join path we can throw on not found persister + // Since IDENT node is not expected for implicit join path, we can throw on not found persister return (IQueryable) SessionFactoryHelper.RequireClassPersister(pathIdentNode.Path); } else if (path.Type == DOT)