Do not include annotation fields when selects specific fields #634
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
devxoul
force-pushed
the
devxoul/values-select-specific
branch
from
a4e2f36 to
ea8375e
Compare
devxoul
changed the title
devxoul
force-pushed
the
devxoul/values-select-specific
branch
from
f91012f to
ea8375e
Compare
devxoul
force-pushed
the
devxoul/values-select-specific
branch
from
ea8375e to
ce2c0a4
Compare
devxoul
changed the title
| @@ -414,8 +414,9 @@ def raw_values(self, *fields): | |||
| def _values(self, *original, **kwargs): | |||
| if not kwargs.pop('prepare', False): | |||
| return super(MultilingualQuerySet, self)._values(*original, **kwargs) | |||
| selects_all = kwargs.pop('selects_all', False) | |||
There was a problem hiding this comment.
i think selects_all should be defined explicitly in function definition, becouse otherwise it could be handed over to super()
There was a problem hiding this comment.
or, at least, this line should be above 415, if we want to match original definition.
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.
After #633 got merged, I found a non-standard behavior. By default, with using
values()orvalues_list()with specific fields, the queryset should not include annotated fields.queryset.annotate(foo=bar).values():{'id': 10, 'foo': 'bar'}# should include annotated fieldsqueryset.annotate(foo=bar).values('id'):{'id': 10}# should NOT include annotated fieldsThis PR ensures the Django's default behavior of
values()andvalues_list()with fields.