Skip to content

Commit 8ead768

Browse files
SimonCroppSimonCropp
committed
remove disableAsync feature
1 parent 5186895 commit 8ead768

File tree

10 files changed

+14
-54
lines changed

10 files changed

+14
-54
lines changed

‎docs/configuration.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ public static void RegisterInContainer<TDbContext>(
2222
ResolveDbContext<TDbContext>? resolveDbContext = null,
2323
IModel? model = null,
2424
ResolveFilters<TDbContext>? resolveFilters = null,
25-
bool disableTracking = false,
26-
bool disableAsync = false)
25+
bool disableTracking = false)
2726
```
28-
<sup><a href='/src/GraphQL.EntityFramework/EfGraphQLConventions.cs#L14-L24' title='Snippet source file'>snippet source</a> | <a href='#snippet-RegisterInContainer' title='Start of snippet'>anchor</a></sup>
27+
<sup><a href='/src/GraphQL.EntityFramework/EfGraphQLConventions.cs#L14-L23' title='Snippet source file'>snippet source</a> | <a href='#snippet-RegisterInContainer' title='Start of snippet'>anchor</a></sup>
2928
<a id='snippet-RegisterInContainer-1'></a>
3029
```cs
3130
EfGraphQLConventions.RegisterInContainer<MyDbContext>(
@@ -123,10 +122,9 @@ public static void RegisterInContainer<TDbContext>(
123122
ResolveDbContext<TDbContext>? resolveDbContext = null,
124123
IModel? model = null,
125124
ResolveFilters<TDbContext>? resolveFilters = null,
126-
bool disableTracking = false,
127-
bool disableAsync = false)
125+
bool disableTracking = false)
128126
```
129-
<sup><a href='/src/GraphQL.EntityFramework/EfGraphQLConventions.cs#L14-L24' title='Snippet source file'>snippet source</a> | <a href='#snippet-RegisterInContainer' title='Start of snippet'>anchor</a></sup>
127+
<sup><a href='/src/GraphQL.EntityFramework/EfGraphQLConventions.cs#L14-L23' title='Snippet source file'>snippet source</a> | <a href='#snippet-RegisterInContainer' title='Start of snippet'>anchor</a></sup>
130128
<a id='snippet-RegisterInContainer-1'></a>
131129
```cs
132130
EfGraphQLConventions.RegisterInContainer<MyDbContext>(

‎src/GraphQL.EntityFramework/EfGraphQLConventions.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public static void RegisterInContainer<TDbContext>(
1818
ResolveDbContext<TDbContext>? resolveDbContext = null,
1919
IModel? model = null,
2020
ResolveFilters<TDbContext>? resolveFilters = null,
21-
bool disableTracking = false,
22-
bool disableAsync = false)
21+
bool disableTracking = false)
2322

2423
#endregion
2524

@@ -28,7 +27,7 @@ public static void RegisterInContainer<TDbContext>(
2827
RegisterScalarsAndArgs(services);
2928
services.AddHttpContextAccessor();
3029
services.AddTransient<HttpContextCapture>();
31-
services.AddSingleton(provider => Build(resolveDbContext, model, resolveFilters, provider, disableTracking, disableAsync));
30+
services.AddSingleton(provider => Build(resolveDbContext, model, resolveFilters, provider, disableTracking));
3231
services.AddSingleton<IEfGraphQLService<TDbContext>>(provider => provider.GetRequiredService<EfGraphQLService<TDbContext>>());
3332
}
3433

@@ -37,8 +36,7 @@ static EfGraphQLService<TDbContext> Build<TDbContext>(
3736
IModel? model,
3837
ResolveFilters<TDbContext>? filters,
3938
IServiceProvider provider,
40-
bool disableTracking,
41-
bool disableAsync)
39+
bool disableTracking)
4240
where TDbContext : DbContext
4341
{
4442
model ??= ResolveModel<TDbContext>(provider);
@@ -49,8 +47,7 @@ static EfGraphQLService<TDbContext> Build<TDbContext>(
4947
model,
5048
dbContextResolver,
5149
filters,
52-
disableTracking,
53-
disableAsync);
50+
disableTracking);
5451
}
5552

5653
static TDbContext DbContextFromProvider<TDbContext>(IServiceProvider provider, IServiceProvider? requestServices)

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public partial class EfGraphQLService<TDbContext> :
66
{
77
ResolveFilters<TDbContext>? resolveFilters;
88
bool disableTracking;
9-
bool disableAsync;
109
ResolveDbContext<TDbContext> resolveDbContext;
1110
IReadOnlyDictionary<Type, List<string>> keyNames;
1211

@@ -15,12 +14,10 @@ public EfGraphQLService(
1514
IModel model,
1615
ResolveDbContext<TDbContext> resolveDbContext,
1716
ResolveFilters<TDbContext>? resolveFilters = null,
18-
bool disableTracking = false,
19-
bool disableAsync = false)
17+
bool disableTracking = false)
2018
{
2119
this.resolveFilters = resolveFilters;
2220
this.disableTracking = disableTracking;
23-
this.disableAsync = disableAsync;
2421
this.resolveDbContext = resolveDbContext;
2522

2623
keyNames = model.GetKeyNames();

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,7 @@ FieldType BuildFirstField<TSource, TReturn>(
159159
TReturn? first;
160160
try
161161
{
162-
if (disableAsync)
163-
{
164-
first = query.FirstOrDefault();
165-
}
166-
else
167-
{
168-
first = await query.FirstOrDefaultAsync(context.CancellationToken);
169-
}
162+
first = await query.FirstOrDefaultAsync(context.CancellationToken);
170163
}
171164
catch (TaskCanceledException)
172165
{
@@ -184,7 +177,6 @@ FieldType BuildFirstField<TSource, TReturn>(
184177
GraphType: {graphType.FullName}
185178
TSource: {typeof(TSource).FullName}
186179
TReturn: {typeof(TReturn).FullName}
187-
DisableAsync: {disableAsync}
188180
OmitQueryArguments: {omitQueryArguments}
189181
Nullable: {nullable}
190182
KeyNames: {JoinKeys(names)}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public ConnectionBuilder<TSource> AddNavigationConnectionField<TSource, TReturn>
4141
ItemGraphType: {itemGraphType.FullName}
4242
TSource: {typeof(TSource).FullName}
4343
TReturn: {typeof(TReturn).FullName}
44-
DisableAsync: {disableAsync}
4544
""",
4645
exception);
4746
}
@@ -88,7 +87,6 @@ ConnectionBuilder<TSource> AddEnumerableConnection<TSource, TGraph, TReturn>(
8887
TGraph: {typeof(TGraph).FullName}
8988
TSource: {typeof(TSource).FullName}
9089
TReturn: {typeof(TReturn).FullName}
91-
DisableAsync: {disableAsync}
9290
""",
9391
exception);
9492
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,8 @@ FieldType BuildQueryField<TSource, TReturn>(
109109

110110
try
111111
{
112-
if (disableAsync)
113-
{
114-
list = query.ToList();
115-
}
116-
else
117-
{
118112
list = await query
119113
.ToListAsync(context.CancellationToken);
120-
}
121114
}
122115
catch (TaskCanceledException)
123116
{
@@ -137,7 +130,6 @@ FieldType BuildQueryField<TSource, TReturn>(
137130
TReturn: {typeof(TReturn).FullName}
138131
DisableTracking: {disableTracking}
139132
HasId: {hasId}
140-
DisableAsync: {disableAsync}
141133
KeyNames: {JoinKeys(names)}
142134
Query: {query.ToQueryString()}
143135
""",

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public ConnectionBuilder<object> AddQueryConnectionField<TReturn>(
5656
Failed to execute query for field `{name}`
5757
ItemGraphType: {itemGraphType.FullName}
5858
TReturn: {typeof(TReturn).FullName}
59-
DisableAsync: {disableAsync}
6059
""",
6160
exception);
6261
}
@@ -114,7 +113,6 @@ public ConnectionBuilder<TSource> AddQueryConnectionField<TSource, TReturn>(
114113
ItemGraphType: {itemGraphType.FullName}
115114
TSource: {typeof(TSource).FullName}
116115
TReturn: {typeof(TReturn).FullName}
117-
DisableAsync: {disableAsync}
118116
""",
119117
exception);
120118
}
@@ -175,7 +173,6 @@ ConnectionBuilder<TSource> AddQueryableConnection<TSource, TGraph, TReturn>(
175173
TGraph: {typeof(TGraph).FullName}
176174
TSource: {typeof(TSource).FullName}
177175
TReturn: {typeof(TReturn).FullName}
178-
DisableAsync: {disableAsync}
179176
KeyNames: {JoinKeys(names)}
180177
Query: {query.ToQueryString()}
181178
""",

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,7 @@ FieldType BuildSingleField<TSource, TReturn>(
160160
TReturn? single;
161161
try
162162
{
163-
if (disableAsync)
164-
{
165-
single = query.SingleOrDefault();
166-
}
167-
else
168-
{
169-
single = await query.SingleOrDefaultAsync(context.CancellationToken);
170-
}
163+
single = await query.SingleOrDefaultAsync(context.CancellationToken);
171164
}
172165
catch (TaskCanceledException)
173166
{
@@ -185,7 +178,6 @@ FieldType BuildSingleField<TSource, TReturn>(
185178
GraphType: {graphType.FullName}
186179
TSource: {typeof(TSource).FullName}
187180
TReturn: {typeof(TReturn).FullName}
188-
DisableAsync: {disableAsync}
189181
OmitQueryArguments: {omitQueryArguments}
190182
Nullable: {nullable}
191183
KeyNames: {JoinKeys(names)}

‎src/Tests/IntegrationTests/IntegrationTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3078,7 +3078,6 @@ static async Task RunQuery(
30783078
Filters<IntegrationDbContext>? filters,
30793079
bool disableTracking,
30803080
object[] entities,
3081-
bool disableAsync = false,
30823081
[CallerFilePath] string sourceFile = "")
30833082
{
30843083
var dbContext = database.Context;
@@ -3099,7 +3098,7 @@ static async Task RunQuery(
30993098
string result;
31003099
try
31013100
{
3102-
result = await QueryExecutor.ExecuteQuery(query, services, context, inputs, filters, disableTracking, disableAsync);
3101+
result = await QueryExecutor.ExecuteQuery(query, services, context, inputs, filters, disableTracking);
31033102
}
31043103
catch (ExecutionError executionError)
31053104
{

‎src/Tests/IntegrationTests/QueryExecutor.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ public static async Task<string> ExecuteQuery<TDbContext>(
66
TDbContext data,
77
Inputs? inputs,
88
Filters<TDbContext>? filters,
9-
bool disableTracking,
10-
bool disableAsync)
9+
bool disableTracking)
1110
where TDbContext : DbContext
1211
{
1312
EfGraphQLConventions.RegisterInContainer(
1413
services,
1514
(_, _) => data,
1615
data.Model,
1716
_ => filters,
18-
disableTracking,
19-
disableAsync);
17+
disableTracking);
2018
await using var provider = services.BuildServiceProvider();
2119
using var schema = new Schema(provider);
2220
var executer = new EfDocumentExecuter();

0 commit comments

Comments
 (0)