Skip to content
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

Query: Fix some nullability errors #28045

Merged
merged 1 commit into from
May 18, 2022
Merged

Query: Fix some nullability errors #28045

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
6 changes: 3 additions & 3 deletions ...emoryShapedQueryCompilingExpressionVisitor.ShaperExpressionProcessingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,9 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
private static void IncludeReference<TEntity, TIncludingEntity, TIncludedEntity>(
QueryContext queryContext,
TEntity entity,
TIncludedEntity relatedEntity,
TIncludedEntity? relatedEntity,
INavigationBase navigation,
INavigationBase inverseNavigation,
INavigationBase? inverseNavigation,
Action<TIncludingEntity, TIncludedEntity> fixup,
bool trackingQuery)
where TIncludingEntity : class, TEntity
Expand Down Expand Up @@ -298,7 +298,7 @@ private static void IncludeCollection<TEntity, TIncludingEntity, TIncludedEntity
Func<QueryContext, ValueBuffer, TIncludedEntity> innerShaper,
TEntity entity,
INavigationBase navigation,
INavigationBase inverseNavigation,
INavigationBase? inverseNavigation,
Action<TIncludingEntity, TIncludedEntity> fixup,
bool trackingQuery,
bool setLoaded)
Expand Down
18 changes: 9 additions & 9 deletions ...uery/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,9 +1151,9 @@ private static TValue ThrowReadValueException<TValue>(
private static void IncludeReference<TEntity, TIncludingEntity, TIncludedEntity>(
QueryContext queryContext,
TEntity entity,
TIncludedEntity relatedEntity,
TIncludedEntity? relatedEntity,
INavigationBase navigation,
INavigationBase inverseNavigation,
INavigationBase? inverseNavigation,
Action<TIncludingEntity, TIncludedEntity> fixup,
bool trackingQuery)
where TEntity : class
Expand Down Expand Up @@ -1240,7 +1240,7 @@ private static void PopulateIncludeCollection<TIncludingEntity, TIncludedEntity>
IReadOnlyList<ValueComparer> outerIdentifierValueComparers,
IReadOnlyList<ValueComparer> selfIdentifierValueComparers,
Func<QueryContext, DbDataReader, ResultContext, SingleQueryResultCoordinator, TIncludedEntity> innerShaper,
INavigationBase inverseNavigation,
INavigationBase? inverseNavigation,
Action<TIncludingEntity, TIncludedEntity> fixup,
bool trackingQuery)
where TIncludingEntity : class
Expand Down Expand Up @@ -1395,8 +1395,8 @@ private static void PopulateSplitIncludeCollection<TIncludingEntity, TIncludedEn
Func<QueryContext, DbDataReader, object[]> childIdentifier,
IReadOnlyList<ValueComparer> identifierValueComparers,
Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TIncludedEntity> innerShaper,
Action<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator> relatedDataLoaders,
INavigationBase inverseNavigation,
Action<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator>? relatedDataLoaders,
INavigationBase? inverseNavigation,
Action<TIncludingEntity, TIncludedEntity> fixup,
bool trackingQuery)
where TIncludingEntity : class
Expand Down Expand Up @@ -1476,8 +1476,8 @@ private static async Task PopulateSplitIncludeCollectionAsync<TIncludingEntity,
Func<QueryContext, DbDataReader, object[]> childIdentifier,
IReadOnlyList<ValueComparer> identifierValueComparers,
Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TIncludedEntity> innerShaper,
Func<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task> relatedDataLoaders,
INavigationBase inverseNavigation,
Func<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task>? relatedDataLoaders,
INavigationBase? inverseNavigation,
Action<TIncludingEntity, TIncludedEntity> fixup,
bool trackingQuery)
where TIncludingEntity : class
Expand Down Expand Up @@ -1720,7 +1720,7 @@ private static void PopulateSplitCollection<TCollection, TElement, TRelatedEntit
Func<QueryContext, DbDataReader, object[]> childIdentifier,
IReadOnlyList<ValueComparer> identifierValueComparers,
Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TRelatedEntity> innerShaper,
Action<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator> relatedDataLoaders)
Action<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator>? relatedDataLoaders)
where TRelatedEntity : TElement
where TCollection : class, ICollection<TElement>
{
Expand Down Expand Up @@ -1796,7 +1796,7 @@ private static async Task PopulateSplitCollectionAsync<TCollection, TElement, TR
Func<QueryContext, DbDataReader, object[]> childIdentifier,
IReadOnlyList<ValueComparer> identifierValueComparers,
Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TRelatedEntity> innerShaper,
Func<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task> relatedDataLoaders)
Func<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task>? relatedDataLoaders)
where TRelatedEntity : TElement
where TCollection : class, ICollection<TElement>
{
Expand Down