Skip to content

Commit d99e5c9

Browse files
committed
Fix to #30115 - IndexOutOfRangeException in CreateNavigationExpansionExpression(Expression sourceExpression, IEntityType entityType) / get_Chars(Int32 index) when EF class named "<>f__AnonymousType01Child" in 7.0.2 version
Check if ShortName returns empty string, and if so use token parameter name. Fixes #30115
1 parent 5844d95 commit d99e5c9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,12 @@ private NavigationExpansionExpression CreateNavigationExpansionExpression(
19471947
PopulateEagerLoadedNavigations(entityReference.IncludePaths);
19481948

19491949
var currentTree = new NavigationTreeExpression(entityReference);
1950-
var parameterName = GetParameterName(entityType.ShortName()[0].ToString().ToLowerInvariant());
1950+
1951+
var entityTypeName = entityType.ShortName();
1952+
var parameterName = GetParameterName(
1953+
string.IsNullOrEmpty(entityTypeName)
1954+
? "e"
1955+
: entityTypeName[0].ToString().ToLowerInvariant());
19511956

19521957
return new NavigationExpansionExpression(sourceExpression, currentTree, currentTree, parameterName);
19531958
}

0 commit comments

Comments
 (0)