Reset eager loaders before triggering before find. #10868
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In #10657 I made a change to reset eager loaders when creating a clone to fix state being shared across query clones. Because of method ordering this resulted in the eager loader being reset *after* the beforeFind was triggered, which dropped any contained associations added during that event. Re-ordering the method calls allows contained associations added during the beforeFind to be retained in the count() query. Refs #10813
Codecov Report
@@ Coverage Diff @@
## master #10868 +/- ##
============================================
- Coverage 94.92% 94.92% -0.01%
Complexity 12123 12123
============================================
Files 422 422
Lines 30142 30142
============================================
- Hits 28613 28612 -1
- Misses 1529 1530 +1
Continue to review full report at Codecov.
|
|
Order based dependencies are the worst, glad you could find a way to solve the issue :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #10657 I made a change to reset eager loaders when creating a clone to fix state being shared across query clones. Because of method ordering this resulted in the eager loader being reset after the beforeFind was triggered, which dropped any contained associations added during that event. Re-ordering the method calls allows contained associations added during the beforeFind to be retained in the count() query.
Refs #10813