Skip to content

Allow null returned for nullable query resutls #1130

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

Merged
merged 1 commit into from
Aug 25, 2025
Merged

Allow null returned for nullable query resutls #1130

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
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;NU5104;CS1573;CS9107;NU1608;NU1109</NoWarn>
<Version>32.0.1</Version>
<Version>32.1.0</Version>
<LangVersion>preview</LangVersion>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
Expand Down
47 changes: 28 additions & 19 deletions src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_First.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ partial class EfGraphQLService<TDbContext>
public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
IObjectGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>?> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
Type? graphType = null,
bool nullable = false,
Expand All @@ -22,7 +22,7 @@ public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
IObjectGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IQueryable<TReturn>>> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IQueryable<TReturn>?>?> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
Type? graphType = null,
bool nullable = false,
Expand All @@ -38,7 +38,7 @@ public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>?> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
Type? graphType = null,
bool nullable = false,
Expand All @@ -54,7 +54,7 @@ public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IQueryable<TReturn>>> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IQueryable<TReturn>?>?> resolve,
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
Type? graphType = null,
bool nullable = false,
Expand All @@ -70,7 +70,7 @@ public FieldBuilder<object, TReturn> AddFirstField<TReturn>(
public FieldBuilder<TSource, TReturn> AddFirstField<TSource, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>?> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate = null,
Type? graphType = null,
bool nullable = false,
Expand All @@ -86,7 +86,7 @@ public FieldBuilder<TSource, TReturn> AddFirstField<TSource, TReturn>(
public FieldBuilder<TSource, TReturn> AddFirstField<TSource, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>>> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>?>?> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate = null,
Type? graphType = null,
bool nullable = false,
Expand All @@ -101,7 +101,7 @@ public FieldBuilder<TSource, TReturn> AddFirstField<TSource, TReturn>(

FieldType BuildFirstField<TSource, TReturn>(
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>?> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate,
Type? graphType,
bool nullable,
Expand All @@ -123,7 +123,7 @@ FieldType BuildFirstField<TSource, TReturn>(

FieldType BuildFirstField<TSource, TReturn>(
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>>> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>?>?> resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate,
Type? graphType,
bool nullable,
Expand All @@ -143,9 +143,20 @@ FieldType BuildFirstField<TSource, TReturn>(
Type = graphType,
Resolver = new FuncFieldResolver<TSource, TReturn?>(async context =>
{
var efFieldContext = BuildContext(context);
var fieldContext = BuildContext(context);

var task = resolve(fieldContext);
if (task == null)
{
return ReturnNullable();
}

var query = await task;
if (query == null)
{
return ReturnNullable();
}

var query = await resolve(efFieldContext);
if (disableTracking)
{
query = query.AsNoTracking();
Expand Down Expand Up @@ -187,24 +198,19 @@ FieldType BuildFirstField<TSource, TReturn>(

if (first is not null)
{
if (efFieldContext.Filters == null ||
await efFieldContext.Filters.ShouldInclude(context.UserContext, efFieldContext.DbContext, context.User, first))
if (fieldContext.Filters == null ||
await fieldContext.Filters.ShouldInclude(context.UserContext, fieldContext.DbContext, context.User, first))
{
if (mutate is not null)
{
await mutate.Invoke(efFieldContext, first);
await mutate.Invoke(fieldContext, first);
}

return first;
}
}

if (nullable)
{
return null;
}

throw new FirstEntityNotFoundException();
return ReturnNullable();
})
};

Expand All @@ -214,5 +220,8 @@ await efFieldContext.Filters.ShouldInclude(context.UserContext, efFieldContext.D
}

return type;

TReturn? ReturnNullable() =>
nullable ? null : throw new FirstEntityNotFoundException();
}
}
30 changes: 21 additions & 9 deletions src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_Queryable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ partial class EfGraphQLService<TDbContext>
public FieldBuilder<object, TReturn> AddQueryField<TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>?>? resolve = null,
Type? graphType = null,
bool omitQueryArguments = false)
where TReturn : class
Expand All @@ -19,7 +19,7 @@ public FieldBuilder<object, TReturn> AddQueryField<TReturn>(
public FieldBuilder<object, TReturn> AddQueryField<TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IQueryable<TReturn>>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IQueryable<TReturn>?>?>? resolve = null,
Type? graphType = null,
bool omitQueryArguments = false)
where TReturn : class
Expand All @@ -32,7 +32,7 @@ public FieldBuilder<object, TReturn> AddQueryField<TReturn>(
public FieldBuilder<TSource, TReturn> AddQueryField<TSource, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>?>? resolve = null,
Type? itemGraphType = null,
bool omitQueryArguments = false)
where TReturn : class
Expand All @@ -45,7 +45,7 @@ public FieldBuilder<TSource, TReturn> AddQueryField<TSource, TReturn>(
public FieldBuilder<TSource, TReturn> AddQueryField<TSource, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>?>?>? resolve = null,
Type? itemGraphType = null,
bool omitQueryArguments = false)
where TReturn : class
Expand All @@ -58,7 +58,7 @@ public FieldBuilder<TSource, TReturn> AddQueryField<TSource, TReturn>(
FieldType BuildQueryField<TSource, TReturn>(
Type? itemGraphType,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>>? resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>?>? resolve,
bool omitQueryArguments)
where TReturn : class =>
BuildQueryField<TSource, TReturn>(
Expand All @@ -70,7 +70,7 @@ FieldType BuildQueryField<TSource, TReturn>(
FieldType BuildQueryField<TSource, TReturn>(
Type? itemGraphType,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>>>? resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IQueryable<TReturn>?>?>? resolve,
bool omitQueryArguments)
where TReturn : class
{
Expand All @@ -91,7 +91,19 @@ FieldType BuildQueryField<TSource, TReturn>(
async context =>
{
var fieldContext = BuildContext(context);
var query = await resolve(fieldContext);

var task = resolve(fieldContext);
if (task == null)
{
return [];
}

var query = await task;
if (query == null)
{
return [];
}

if (disableTracking)
{
query = query.AsNoTracking();
Expand All @@ -109,8 +121,8 @@ FieldType BuildQueryField<TSource, TReturn>(

try
{
list = await query
.ToListAsync(context.CancellationToken);
list = await query
.ToListAsync(context.CancellationToken);
}
catch (TaskCanceledException)
{
Expand Down
30 changes: 21 additions & 9 deletions src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_QueryableConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ partial class EfGraphQLService<TDbContext>
public ConnectionBuilder<object> AddQueryConnectionField<TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, IOrderedQueryable<TReturn>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, object>, IOrderedQueryable<TReturn>?>? resolve = null,
Type? itemGraphType = null,
bool omitQueryArguments = false)
where TReturn : class =>
Expand All @@ -23,7 +23,7 @@ public ConnectionBuilder<object> AddQueryConnectionField<TReturn>(
public ConnectionBuilder<object> AddQueryConnectionField<TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IOrderedQueryable<TReturn>>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, object>, Task<IOrderedQueryable<TReturn>?>?>? resolve = null,
Type? itemGraphType = null,
bool omitQueryArguments = false)
where TReturn : class
Expand Down Expand Up @@ -64,7 +64,7 @@ public ConnectionBuilder<object> AddQueryConnectionField<TReturn>(
public ConnectionBuilder<TSource> AddQueryConnectionField<TSource, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, IOrderedQueryable<TReturn>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, TSource>, IOrderedQueryable<TReturn>?>? resolve = null,
Type? itemGraphType = null,
bool omitQueryArguments = false)
where TReturn : class =>
Expand All @@ -78,7 +78,7 @@ public ConnectionBuilder<TSource> AddQueryConnectionField<TSource, TReturn>(
public ConnectionBuilder<TSource> AddQueryConnectionField<TSource, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IOrderedQueryable<TReturn>>>? resolve = null,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IOrderedQueryable<TReturn>?>?>? resolve = null,
Type? itemGraphType = null,
bool omitQueryArguments = false)
where TReturn : class
Expand Down Expand Up @@ -121,7 +121,7 @@ public ConnectionBuilder<TSource> AddQueryConnectionField<TSource, TReturn>(
ConnectionBuilder<TSource> AddQueryableConnection<TSource, TGraph, TReturn>(
IComplexGraphType graph,
string name,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IOrderedQueryable<TReturn>>>? resolve,
Func<ResolveEfFieldContext<TDbContext, TSource>, Task<IOrderedQueryable<TReturn>?>?>? resolve,
bool omitQueryArguments)
where TGraph : IGraphType
where TReturn : class
Expand All @@ -134,8 +134,20 @@ ConnectionBuilder<TSource> AddQueryableConnection<TSource, TGraph, TReturn>(
builder.ResolveAsync(
async context =>
{
var efFieldContext = BuildContext(context);
IQueryable<TReturn> query = await resolve(efFieldContext);
var fieldContext = BuildContext(context);

var task = resolve(fieldContext);
if (task == null)
{
return new Connection<TSource>();
}

IQueryable<TReturn>? query = await task;
if (query == null)
{
return new Connection<TSource>();
}

if (disableTracking)
{
query = query.AsNoTracking();
Expand All @@ -154,8 +166,8 @@ ConnectionBuilder<TSource> AddQueryableConnection<TSource, TGraph, TReturn>(
context.Before!,
context,
context.CancellationToken,
efFieldContext.Filters,
efFieldContext.DbContext);
fieldContext.Filters,
fieldContext.DbContext);
}
catch (TaskCanceledException)
{
Expand Down
Loading
Loading