2.2 -> 5.0.5 (.Net Core 3.1) strange subquery in simple select with Include

I’ve first posted to npgsql (https://github.com/npgsql/efcore.pg/issues/1808), but it works the same with sqlite

var deliveryChannel = dbContext.DeliveryChannel.AsNoTrackingWithIdentityResolution().Include(c => c.ClientData).ThenInclude(c => c.DeliveryChannel).Where(c => (c.State == State.Active && c.ExtendedData == "someData") ).OrderByDescending(d => d.Id).FirstOrDefaultAsync().Result;

ClientData has a collection of DeliveryChannels. I’m selecting all DeliveryChannels from the Client of some exact DeliveryChannel (why not? 😃 ).

and it produces strange subquery in first select of split query (in EF 2.2 there is no subquery):

public class ClientData
{
...
 public virtual ICollection<DeliveryChannel> DeliveryChannel { get; set; }
}

public class DeliveryChannel{
...
      public int ClientDataId { get; set; }
      public ClientData ClientData { get; set; }
}

options.UseSqlite("Data Source=sqlitedemo.db", p => p.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));

[freerider7777]

@smitpatel Do you know sql? 😃 Have a look at the underlined lines (in the picture) and you will see that inner select is with limit 1, so it is not needed to do subquery and order by in outer query. In 2.2 it was a simple select without subquery. It’a pity EF is not consistent and every new version brings some hidden surprises…

[smitpatel]

It requires some big changes happened in 6.0 so sadly the earlier release will be 6.0-preview5