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 @@ -69,7 +69,9 @@ public virtual Expression Process(Expression expression)
switch (expression)
{
case ShapedQueryExpression shapedQueryExpression:
return shapedQueryExpression.UpdateQueryExpression(Visit(shapedQueryExpression.QueryExpression));
return shapedQueryExpression
.UpdateQueryExpression(Visit(shapedQueryExpression.QueryExpression))
.UpdateShaperExpression(Visit(shapedQueryExpression.ShaperExpression));

case SelectExpression selectExpression:
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,42 @@ public virtual async Task Same_collection_with_conflicting_type_mappings_not_sup

#endregion Type mapping inference

[ConditionalFact]
public virtual async Task Ordered_collection_with_split_query()
{
var contextFactory = await InitializeAsync<Context32976>(
onModelCreating: mb => mb.Entity<Context32976.Principal>(),
seed: context =>
{
context.Add(new Context32976.Principal { Ints = [2, 3, 4]});
context.SaveChanges();
});

await using var context = contextFactory.CreateContext();

_ = await context.Set<Context32976.Principal>()
.Where(p => p.Ints.Skip(1).Contains(3))
.Include(p => p.Dependents)
.AsSplitQuery()
.SingleAsync();
}

public class Context32976(DbContextOptions options) : DbContext(options)
{
public class Principal
{
public int Id { get; set; }
public List<int> Ints { get; set; }
public List<Dependent> Dependents { get; set; }
}

public class Dependent
{
public int Id { get; set; }
public Principal Principal { get; set; }
}
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());
Expand Down