Skip to content

Use proper inner join in Linq instead of implicit join and where clauses #2037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use proper inner join in Linq instead of implicit join and where clauses #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/NHibernate/Hql/Ast/HqlTreeBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,11 @@ public HqlJoin Join(HqlExpression expression, HqlAlias @alias)
return new HqlJoin(_factory, expression, @alias);
}

public HqlInnerJoin InnerJoin(HqlExpression expression, HqlAlias @alias)
{
return new HqlInnerJoin(_factory, expression, @alias);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately new join feature does not support implicit join types, so have to be explicit.

}

public HqlAny Any()
{
return new HqlAny(_factory);
Expand Down
19 changes: 18 additions & 1 deletion src/NHibernate/Hql/Ast/HqlTreeNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,9 +822,18 @@ public HqlJoin(IASTFactory factory, HqlExpression expression, HqlAlias @alias) :
}
}

public class HqlInnerJoin : HqlTreeNode
{
public HqlInnerJoin(IASTFactory factory, HqlExpression expression, HqlAlias @alias)
: base(HqlSqlWalker.JOIN, "join", factory, new HqlInner(factory), expression, @alias)
{
}
}

public class HqlLeftJoin : HqlTreeNode
{
public HqlLeftJoin(IASTFactory factory, HqlExpression expression, HqlAlias @alias) : base(HqlSqlWalker.JOIN, "join", factory, new HqlLeft(factory), expression, @alias)
public HqlLeftJoin(IASTFactory factory, HqlExpression expression, HqlAlias @alias)
: base(HqlSqlWalker.JOIN, "join", factory, new HqlLeft(factory), expression, @alias)
{
}
}
Expand Down Expand Up @@ -876,6 +885,14 @@ public HqlBitwiseAnd(IASTFactory factory, HqlExpression lhs, HqlExpression rhs)
}
}

public class HqlInner : HqlTreeNode
{
public HqlInner(IASTFactory factory)
: base(HqlSqlWalker.INNER, "inner", factory)
{
}
}

public class HqlLeft : HqlTreeNode
{
public HqlLeft(IASTFactory factory)
Expand Down
16 changes: 9 additions & 7 deletions src/NHibernate/Linq/Visitors/QueryModelVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public override void VisitNhJoinClause(NhJoinClause joinClause, QueryModel query
HqlTreeNode hqlJoin;
if (joinClause.IsInner)
{
hqlJoin = _hqlTree.TreeBuilder.Join(expression, alias);
hqlJoin = _hqlTree.TreeBuilder.InnerJoin(expression, alias);
}
else
{
Expand Down Expand Up @@ -497,15 +497,17 @@ public override void VisitOrderByClause(OrderByClause orderByClause, QueryModel

public override void VisitJoinClause(JoinClause joinClause, QueryModel queryModel, int index)
{
var querySourceName = VisitorParameters.QuerySourceNamer.GetName(joinClause);
var equalityVisitor = new EqualityHqlGenerator(VisitorParameters);
var whereClause = equalityVisitor.Visit(joinClause.InnerKeySelector, joinClause.OuterKeySelector);

_hqlTree.AddWhereClause(whereClause);

_hqlTree.AddFromClause(
_hqlTree.TreeBuilder.Range(
HqlGeneratorExpressionVisitor.Visit(joinClause.InnerSequence, VisitorParameters),
_hqlTree.TreeBuilder.Alias(joinClause.ItemName)));
var expression = HqlGeneratorExpressionVisitor.Visit(joinClause.InnerSequence, VisitorParameters).AsExpression();
var hqlJoin = _hqlTree.TreeBuilder.InnerJoin(
expression,
_hqlTree.TreeBuilder.Alias(querySourceName)
);
hqlJoin.AddChild(_hqlTree.TreeBuilder.With(whereClause.ToBooleanExpression()));
_hqlTree.AddFromClause(hqlJoin);
}

public override void VisitGroupJoinClause(GroupJoinClause groupJoinClause, QueryModel queryModel, int index)
Expand Down