Unify field names in queryset classes #1751
Merged
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.
Description
This is a refactoring change.
This PR:
AwaitableQuery
and its subclasses, e.g. instead of having both_annotations
inAwaitableQuery
(the parent) andannotations
inUpdateQuery
(the child), there will be just a single field called_annotations
_make_query
slightly because there was logic that relied on having two distinct fields_annotations
andannotations
.Motivation and Context
When I was debugging the queryset code, it was really hard to understand what is going on because of the fields named almost identically but having different undocumented purposes. Reusing the fields should make the code more readable and easier to debug.
Here's a relevant discussion in another pull request #1748 (comment)
How Has This Been Tested?
Checklist: