Skip to content

Commit 7bf1595

Browse files
Merge pull request #516 from User00015/NullableInclude
Include/IncludeMany on nullable FK no longer throws exception.
2 parents f9dc447 + 8d5e7d2 commit 7bf1595

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

SqlKata.Execution/QueryFactory.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -749,8 +749,8 @@ private static IEnumerable<T> handleIncludes<T>(Query query, IEnumerable<T> resu
749749

750750
foreach (var item in dynamicResult)
751751
{
752-
var foreignValue = item[include.ForeignKey].ToString();
753-
item[include.Name] = related.ContainsKey(foreignValue) ? related[foreignValue] : null;
752+
var foreignValue = item[include.ForeignKey]?.ToString();
753+
item[include.Name] = foreignValue != null && related.ContainsKey(foreignValue) ? related[foreignValue] : null;
754754
}
755755
}
756756

@@ -843,8 +843,8 @@ private static async Task<IEnumerable<T>> handleIncludesAsync<T>(Query query, IE
843843

844844
foreach (var item in dynamicResult)
845845
{
846-
var foreignValue = item[include.ForeignKey].ToString();
847-
item[include.Name] = related.ContainsKey(foreignValue) ? related[foreignValue] : null;
846+
var foreignValue = item[include.ForeignKey]?.ToString();
847+
item[include.Name] = foreignValue != null && related.ContainsKey(foreignValue) ? related[foreignValue] : null;
848848
}
849849
}
850850

0 commit comments

Comments
 (0)