Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2710,7 +2710,9 @@ public static IQueryable<TEntity> IgnoreQueryFilters<TEntity>(
Expression.Call(
instance: null,
method: IgnoreNamedQueryFiltersMethodInfo.MakeGenericMethod(typeof(TEntity)),
arguments: [source.Expression, Expression.Constant(filterKeys)]))
// converting the collection to an array if it isn't already one to ensure consistent caching. Fixes #37112.
// #37212 may be a possible future solution providing broader capabilities around parameterizing collections.
arguments: [source.Expression, Expression.Constant(filterKeys is string[] ? filterKeys : filterKeys.ToArray())]))
: source;

#endregion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,31 @@ public virtual async Task Named_query_filters_ignore_some()
Assert.Equal(2, result.Count);
}

[ConditionalFact]
public virtual async Task Named_query_filters_caching()
{
var cacheLog = new List<string>();
var contextFactory = await InitializeAsync<Context8576_NamedFilters>(seed: c => c.SeedAsync(), onConfiguring: builder =>
{
builder.EnableSensitiveDataLogging();
builder.LogTo(cacheLog.Add, filter: (eventid, _) => eventid.Name == CoreEventId.QueryCompilationStarting.Name);
});
using var context = contextFactory.CreateContext();
_ = context.Entities
.IgnoreQueryFilters(["ActiveFilter", "NameFilter"])
.ToList();
_ = context.Entities
.IgnoreQueryFilters(["ActiveFilter", "NameFilter"])
.ToList();
_ = context.Entities
.IgnoreQueryFilters(["NameFilter", "ActiveFilter"])
.ToList();

// #37212 - ExpressionEqualityComparer doesn't support collections besides an array,
// therefore we can't implement caching for different order of ignored filters
Assert.Equal(2, cacheLog.Count);
}

[ConditionalFact]
public virtual async Task Named_query_filters_ignore_all()
{
Expand Down