Skip to content

Commit e3d19bf

Browse files
committed
Small refactoring
1 parent 2ad5e7a commit e3d19bf

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

src/NHibernate/Engine/TableGroupJoinHelper.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ internal static bool ProcessAsTableGroupJoin(IReadOnlyList<IJoin> tableGroupJoin
4545
bool include = includeAllSubclassJoins && isSubclassIncluded(join.Alias);
4646
// TODO (from hibernate): Think about if this could be made always true
4747
// NH Specific: made always true (original check: join.JoinType == JoinType.InnerJoin)
48-
var innerJoin = true;
48+
const bool innerJoin = true;
4949
joinFragment.AddJoins(
5050
join.Joinable.FromJoinFragment(join.Alias, innerJoin, include),
5151
join.Joinable.WhereJoinFragment(join.Alias, innerJoin, include));
@@ -87,17 +87,10 @@ private static SqlString GetTableGroupJoinWithClause(SqlString[] withClauseFragm
8787
{
8888
string rhsAlias = first.Alias;
8989
string[] rhsColumns = JoinHelper.GetRHSColumnNames(first.AssociationType, factory);
90-
for (int j = 0; j < lhsColumns.Length; j++)
90+
fromFragment.Add(lhsColumns[0]).Add("=").Add(rhsAlias).Add(".").Add(rhsColumns[0]);
91+
for (int j = 1; j < lhsColumns.Length; j++)
9192
{
92-
fromFragment.Add(lhsColumns[j]);
93-
fromFragment.Add("=");
94-
fromFragment.Add(rhsAlias);
95-
fromFragment.Add(".");
96-
fromFragment.Add(rhsColumns[j]);
97-
if (j < lhsColumns.Length - 1)
98-
{
99-
fromFragment.Add(" and ");
100-
}
93+
fromFragment.Add(" and ").Add(lhsColumns[j]).Add("=").Add(rhsAlias).Add(".").Add(rhsColumns[j]);
10194
}
10295
}
10396

0 commit comments

Comments
 (0)