Skip to content

Commit 5fd52d7

Browse files
SimonCroppSimonCropp
authored
add omitQueryArguments (#779)
1 parent 3a7f93b commit 5fd52d7

9 files changed

Lines changed: 76 additions & 17 deletions

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<NoWarn>CS1591;NU5104;CS1573</NoWarn>
5-
<Version>21.3.1</Version>
5+
<Version>22.0.0</Version>
66
<AssemblyVersion>1.0.0</AssemblyVersion>
77
<PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
88
<ImplicitUsings>true</ImplicitUsings>

‎src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_Single.cs‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ public FieldBuilder<object, TReturn> AddSingleField<TReturn>(
99
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>> resolve,
1010
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
1111
Type? graphType = null,
12-
bool nullable = false)
12+
bool nullable = false,
13+
bool omitQueryArguments = false)
1314
where TReturn : class
1415
{
15-
var field = BuildSingleField(name, resolve, mutate, graphType, nullable);
16+
var field = BuildSingleField(name, resolve, mutate, graphType, nullable, omitQueryArguments);
1617
graph.AddField(field);
1718
return new FieldBuilderEx<object, TReturn>(field);
1819
}
@@ -23,10 +24,11 @@ public FieldBuilder<object, TReturn> AddSingleField<TReturn>(
2324
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>> resolve,
2425
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
2526
Type? graphType = null,
26-
bool nullable = false)
27+
bool nullable = false,
28+
bool omitQueryArguments = false)
2729
where TReturn : class
2830
{
29-
var field = BuildSingleField(name, resolve, mutate, graphType, nullable);
31+
var field = BuildSingleField(name, resolve, mutate, graphType, nullable, omitQueryArguments);
3032
graph.AddField(field);
3133
return new FieldBuilderEx<object, TReturn>(field);
3234
}
@@ -37,10 +39,11 @@ public FieldBuilder<TSource, TReturn> AddSingleField<TSource, TReturn>(
3739
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>> resolve,
3840
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate = null,
3941
Type? graphType = null,
40-
bool nullable = false)
42+
bool nullable = false,
43+
bool omitQueryArguments = false)
4144
where TReturn : class
4245
{
43-
var field = BuildSingleField(name, resolve, mutate, graphType, nullable);
46+
var field = BuildSingleField(name, resolve, mutate, graphType, nullable, omitQueryArguments);
4447
graph.AddField(field);
4548
return new FieldBuilderEx<TSource, TReturn>(field);
4649
}
@@ -50,19 +53,19 @@ FieldType BuildSingleField<TSource, TReturn>(
5053
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>> resolve,
5154
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate,
5255
Type? graphType,
53-
bool nullable)
56+
bool nullable,
57+
bool omitQueryArguments)
5458
where TReturn : class
5559
{
5660
Guard.AgainstWhiteSpace(nameof(name), name);
5761

5862
graphType ??= GraphTypeFinder.FindGraphType<TReturn>(nullable);
5963

6064
var hasId = keyNames.ContainsKey(typeof(TReturn));
61-
return new()
65+
var type = new FieldType
6266
{
6367
Name = name,
6468
Type = graphType,
65-
Arguments = ArgumentAppender.GetQueryArguments(hasId, false),
6669
Resolver = new FuncFieldResolver<TSource, TReturn?>(
6770
async context =>
6871
{
@@ -77,7 +80,10 @@ FieldType BuildSingleField<TSource, TReturn>(
7780
}
7881

7982
query = includeAppender.AddIncludes(query, context);
80-
query = query.ApplyGraphQlArguments(context, names, false);
83+
if (!omitQueryArguments)
84+
{
85+
query = query.ApplyGraphQlArguments(context, names, false);
86+
}
8187

8288
QueryLogger.Write(query);
8389

@@ -112,5 +118,10 @@ FieldType BuildSingleField<TSource, TReturn>(
112118
throw new ExecutionError("Not found");
113119
})
114120
};
121+
if (!omitQueryArguments)
122+
{
123+
type.Arguments = ArgumentAppender.GetQueryArguments(hasId, false);
124+
}
125+
return type;
115126
}
116127
}

‎src/GraphQL.EntityFramework/GraphApi/EfObjectGraphType.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public FieldBuilder<TSource, TReturn> AddSingleField<TReturn>(
6868
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>> resolve,
6969
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate = null,
7070
Type? graphType = null,
71-
bool nullable = false)
71+
bool nullable = false,
72+
bool omitQueryArguments = false)
7273
where TReturn : class =>
73-
GraphQlService.AddSingleField(this, name, resolve, mutate, graphType, nullable);
74+
GraphQlService.AddSingleField(this, name, resolve, mutate, graphType, nullable, omitQueryArguments);
7475
}

‎src/GraphQL.EntityFramework/GraphApi/IEfGraphQLService_Single.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ FieldBuilder<object, TReturn> AddSingleField<TReturn>(
88
Func<ResolveEfFieldContext<TDbContext, object>, IQueryable<TReturn>> resolve,
99
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
1010
Type? graphType = null,
11-
bool nullable = false)
11+
bool nullable = false,
12+
bool omitQueryArguments = false)
1213
where TReturn : class;
1314

1415
FieldBuilder<TSource, TReturn> AddSingleField<TSource, TReturn>(
@@ -17,6 +18,7 @@ FieldBuilder<TSource, TReturn> AddSingleField<TSource, TReturn>(
1718
Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>> resolve,
1819
Func<ResolveEfFieldContext<TDbContext, TSource>, TReturn, Task>? mutate = null,
1920
Type? graphType = null,
20-
bool nullable = false)
21+
bool nullable = false,
22+
bool omitQueryArguments = false)
2123
where TReturn : class;
2224
}

‎src/GraphQL.EntityFramework/GraphApi/QueryGraphType.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ public FieldBuilder<object, TReturn> AddSingleField<TReturn>(
3434
Func<ResolveEfFieldContext<TDbContext, object>, TReturn, Task>? mutate = null,
3535
Type? graphType = null,
3636
string name = nameof(TReturn),
37-
bool nullable = false)
37+
bool nullable = false,
38+
bool omitQueryArguments = false)
3839
where TReturn : class =>
39-
GraphQlService.AddSingleField(this, name, resolve, mutate, graphType, nullable);
40+
GraphQlService.AddSingleField(this, name, resolve, mutate, graphType, nullable, omitQueryArguments);
4041

4142
public IQueryable<TItem> AddIncludes<TItem>(IQueryable<TItem> query, IResolveFieldContext context)
4243
where TItem : class =>

‎src/Tests/IntegrationTests/IntegrationTests.SchemaPrint.verified.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ type Query {
280280
parentEntitiesFiltered(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [FilterParent!]!
281281
parentEntitiesConnectionFiltered(after: String, first: Int, before: String, last: Int, where: [WhereExpression!], orderBy: [OrderBy!], ids: [ID!]): FilterParentConnection!
282282
parentEntity(id: ID, ids: [ID!], where: [WhereExpression!]): Parent!
283+
parentEntityWithNoArgs: Parent!
283284
parentEntityNullable(id: ID, ids: [ID!], where: [WhereExpression!]): Parent
284285
interfaceGraphConnection(after: String, first: Int, before: String, last: Int, where: [WhereExpression!], orderBy: [OrderBy!], ids: [ID!]): InterfaceConnection!
285286
manyToManyLeftEntities(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [ManyToManyLeft!]!

‎src/Tests/IntegrationTests/IntegrationTests.Single_NoArgs.verified.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
target:
3+
{
4+
"data": {
5+
"parentEntityWithNoArgs": {
6+
"property": "Value1"
7+
}
8+
}
9+
},
10+
sql: [
11+
{
12+
HasTransaction: false,
13+
Text:
14+
SELECT TOP(2) [p].[Id], [p].[Property]
15+
FROM [ParentEntities] AS [p]
16+
WHERE [p].[Id] = 'Guid_1'
17+
}
18+
]
19+
}

‎src/Tests/IntegrationTests/IntegrationTests.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,25 @@ public async Task Single_Found()
631631
await RunQuery(database, query, null, null, false, new object[] { entity1, entity2 });
632632
}
633633

634+
[Fact]
635+
public async Task Single_NoArgs()
636+
{
637+
var query = """
638+
{
639+
parentEntityWithNoArgs {
640+
property
641+
}
642+
}
643+
""";
644+
var entity1 = new ParentEntity
645+
{
646+
Id = Guid.Parse("00000000-0000-0000-0000-000000000001"),
647+
Property = "Value1"
648+
};
649+
await using var database = await sqlInstance.Build();
650+
await RunQuery(database, query, null, null, false, new object[] { entity1 });
651+
}
652+
634653
[Fact]
635654
public async Task SingleNullable_NotFound()
636655
{

‎src/Tests/IntegrationTests/Query.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ public Query(IEfGraphQLService<IntegrationDbContext> efGraphQlService) :
8383
name: "parentEntity",
8484
resolve: context => context.DbContext.ParentEntities);
8585

86+
AddSingleField(
87+
name: "parentEntityWithNoArgs",
88+
resolve: context => context.DbContext.ParentEntities.Where(_ => _.Id == new Guid("00000000-0000-0000-0000-000000000001")),
89+
omitQueryArguments: true);
90+
8691
AddSingleField(
8792
name: "parentEntityNullable",
8893
resolve: context => context.DbContext.ParentEntities,

0 commit comments

Comments
 (0)