Skip to content

Commit 2d3a076

Browse files
committed
Merge branch 'dev' of https://github.com/microsoft/fluentui-blazor into dev
2 parents a1f4001 + 567215f commit 2d3a076

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/Core/Components/DataGrid/Infrastructure/AsyncQueryExecutorSupplier.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ internal static class AsyncQueryExecutorSupplier
2525
{
2626
if (queryable is not null)
2727
{
28-
var executor = services.GetService<IAsyncQueryExecutor>();
28+
var executors = services.GetServices<IAsyncQueryExecutor>();
2929

30-
if (executor is null)
30+
if (executors is null)
3131
{
3232
// It's useful to detect if the developer is unaware that they should be using the EF adapter, otherwise
3333
// they will likely never notice and simply deploy an inefficient app that blocks threads on each query.
@@ -37,9 +37,15 @@ internal static class AsyncQueryExecutorSupplier
3737
throw new InvalidOperationException($"The supplied {nameof(IQueryable)} is provided by Entity Framework. To query it efficiently, see https://github.com/microsoft/fluentui-blazor#use-the-datagrid-component-with-ef-core for the needed steps.");
3838
}
3939
}
40-
else if (executor.IsSupported(queryable))
40+
else
4141
{
42-
return executor;
42+
foreach (var executor in executors)
43+
{
44+
if (executor.IsSupported(queryable))
45+
{
46+
return executor;
47+
}
48+
}
4349
}
4450
}
4551

0 commit comments

Comments
 (0)