Skip to content

[release/11.0] Backport: named query filter set by convention cannot be overridden by explicit configuration #37754

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

Closed
Copilot wants to merge 2 commits into from
Closed

[release/11.0] Backport: named query filter set by convention cannot be overridden by explicit configuration #37754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5af25a7
Initial plan
Copilot Feb 20, 2026
e6b88d4
Fix named query filter conventions - backport of #37710
Copilot Feb 20, 2026
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/EFCore/Metadata/Builders/EntityTypeBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ public virtual EntityTypeBuilder HasQueryFilter(LambdaExpression? filter)
/// <returns>The same builder instance so that multiple configuration calls can be chained.</returns>
public virtual EntityTypeBuilder HasQueryFilter(string filterKey, LambdaExpression? filter)
{
Builder.HasQueryFilter(new QueryFilter(filterKey, filter));
Builder.HasQueryFilter(new QueryFilter(filterKey, filter, ConfigurationSource.Explicit));

return this;
}
Expand Down
21 changes: 21 additions & 0 deletions test/EFCore.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3394,6 +3394,27 @@ public void Can_replace_named_query_filter_only_with_lower_or_equal_source()
Assert.NotEqual(filterExpression2, entityBuilder.Metadata.FindDeclaredQueryFilter(filterKey).Expression);
}

[ConditionalFact]
public void Can_override_named_query_filter_from_convention_with_explicit_configuration()
{
var modelBuilder = CreateModelBuilder();
var entityBuilder = modelBuilder.Entity(typeof(Order), ConfigurationSource.Explicit);

LambdaExpression conventionFilter = (Order o) => o.Id == 1;
LambdaExpression explicitFilter = (Order o) => o.Id == 2;
const string filterKey = "testFilter";

entityBuilder.HasQueryFilter(new QueryFilter(filterKey, conventionFilter, ConfigurationSource.Convention));
Assert.Same(conventionFilter, entityBuilder.Metadata.FindDeclaredQueryFilter(filterKey).Expression);
Assert.Equal(ConfigurationSource.Convention, entityBuilder.Metadata.GetQueryFilterConfigurationSource(filterKey));

var publicBuilder = new EntityTypeBuilder(entityBuilder.Metadata);
publicBuilder.HasQueryFilter(filterKey, explicitFilter);

Assert.Same(explicitFilter, entityBuilder.Metadata.FindDeclaredQueryFilter(filterKey).Expression);
Assert.Equal(ConfigurationSource.Explicit, entityBuilder.Metadata.GetQueryFilterConfigurationSource(filterKey));
}

private static TestLogger<DbLoggerCategory.Model, TestLoggingDefinitions> CreateTestLogger()
=> new() { EnabledFor = LogLevel.Warning };

Expand Down