Throw entity not mapped exception for entity join in hql if possible (#2485)

bahusoid · web-flow · commit b131556ef435 · 2020-08-19T23:55:37.000+02:00
diff --git 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);
+				// 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)
 			{

Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,8 @@ private IQueryable ResolveEntityJoinReferencedPersister(IASTNode path)`
`794`	`794`	`if (path.Type == IDENT)`
`795`	`795`	`{`
`796`	`796`	`var pathIdentNode = (IdentNode) path;`
`797`		`- return SessionFactoryHelper.FindQueryableUsingImports(pathIdentNode.Path);`
	`797`	`+ // Since IDENT node is not expected for implicit join path, we can throw on not found persister`
	`798`	`+ return (IQueryable) SessionFactoryHelper.RequireClassPersister(pathIdentNode.Path);`
`798`	`799`	`}`
`799`	`800`	`else if (path.Type == DOT)`
`800`	`801`	`{`