Skip to content
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.

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

Query: Put client method to fetch join entity after filtered include … #21517

Merged
1 commit merged into from
Jul 7, 2020

Conversation

smitpatel
Copy link
Member

…expression

Part of #19003

The issue was that we put the client method to fetch join entity directly after navigation hence the methods on filtered include threw client eval error.
Fix: We generate a join with both join/target entity and apply all filtered incldue expression by remapping them. At the end we apply client projection selector

@smitpatel smitpatel requested a review from maumar July 4, 2020 23:23
@@ -710,10 +710,10 @@ public virtual Task Filtered_include_on_skip_navigation_then_filtered_include_on
{
return AssertQuery(
async,
ss => ss.Set<EntityTwo>().Include(e => e.OneSkip.Where(i => i.Id > 15)).ThenInclude(e => e.Collection.Where(i => i.Id < 5)),
ss => ss.Set<EntityThree>().Include(e => e.OneSkipPayloadFull.Where(i => i.Id > 15)).ThenInclude(e => e.Collection.Where(i => i.Id < 5)),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to change this test since, it was bringing entity two from 2 different query parts where state manager was fixing it up in tracked query and that would make result of filtered include "incorrect"

@ghost
Copy link

ghost commented Jul 4, 2020

Hello @smitpatel!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@smitpatel
Copy link
Member Author

@msftbot require 1 sign-off

@ghost
Copy link

ghost commented Jul 4, 2020

Hello @smitpatel!

I think you told me that you expect at least 1 approvals before I perform the merge, but I am not confident that I have understood you correctly.

Please try rephrasing your instruction to me.

@smitpatel
Copy link
Member Author

@msftbot require 1 approval

@ghost
Copy link

ghost commented Jul 4, 2020

Hello @smitpatel!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I'll only merge this pull request if it has at least 1 approval

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

…expression

Part of #19003

The issue was that we put the client method to fetch join entity directly after navigation hence the methods on filtered include threw client eval error.
Fix: We generate a join with both join/target entity and apply all filtered incldue expression by remapping them. At the end we apply client projection selector
@smitpatel smitpatel force-pushed the smit/filterincludewithjoinentities branch from a822d04 to b2fb18f Compare July 5, 2020 00:08
@ghost ghost merged commit d7c2b2a into master Jul 7, 2020
@ghost ghost deleted the smit/filterincludewithjoinentities branch July 7, 2020 20:49
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants