Skip to content

Fix issue with Include not selecting ComplexMapping columns #713

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue with Include not selecting ComplexMapping columns #713

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
33 changes: 27 additions & 6 deletions src/NPoco/Linq/ComplexSqlBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,27 @@ public Sql BuildJoin(IDatabase database, SqlExpression<T> sqlExpression, List<Jo
return new Sql(newsql, _sqlExpression.Context.Params);
}

private static IEnumerable<PocoColumn> GetJoinPocoColumns(IEnumerable<PocoMember> members)
{
foreach (var member in members)
{
switch (member.ReferenceType)
{
case ReferenceType.Foreign:
break;
case ReferenceType.None:
{
yield return member.PocoColumn;
foreach (var pocoMemberChild in GetJoinPocoColumns(member.PocoMemberChildren))
{
yield return pocoMemberChild;
}
break;
}
}
}
}

private static string BuildJoinSql(IDatabase database, List<JoinData> joinSqlExpressions, ref List<StringPocoCol> cols)
{
var joins = new List<string>();
Expand All @@ -121,14 +142,14 @@ private static string BuildJoinSql(IDatabase database, List<JoinData> joinSqlExp
{
var member = joinSqlExpression.PocoMemberJoin;

cols = cols.Concat(joinSqlExpression.PocoMembers
.Where(x => x.ReferenceType == ReferenceType.None && x.PocoColumn != null && !x.PocoColumn.ResultColumn)
cols = cols.Concat(GetJoinPocoColumns(joinSqlExpression.PocoMembers)
.Where(x => x != null && !x.ResultColumn)
.Select(x => new StringPocoCol
{
StringCol = database.DatabaseType.EscapeTableName(x.PocoColumn.TableInfo.AutoAlias)
+ "." + database.DatabaseType.EscapeSqlIdentifier(x.PocoColumn.ColumnName) + " as " + database.DatabaseType.EscapeSqlIdentifier(x.PocoColumn.MemberInfoKey),
PocoColumn = new[] { x.PocoColumn }
})).ToList();
StringCol = database.DatabaseType.EscapeTableName(x.TableInfo.AutoAlias)
+ "." + database.DatabaseType.EscapeSqlIdentifier(x.ColumnName) + " as " + database.DatabaseType.EscapeSqlIdentifier(x.MemberInfoKey),
PocoColumn = new[] { x }
})).ToList();

joins.Add(string.Format(" {0} JOIN " + database.DatabaseType.EscapeTableName(member.PocoColumn.TableInfo.TableName) + " " + database.DatabaseType.EscapeTableName(member.PocoColumn.TableInfo.AutoAlias) + joinSqlExpression.Hint + " ON " + joinSqlExpression.OnSql, joinSqlExpression.JoinType == JoinType.Inner ? "INNER" : "LEFT"));
}
Expand Down