INTPYTHON-795 Update to Django 6.0 #280
Draft
Conversation
This file contains hidden or 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
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
3b8b13b to
6dacd76
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
22f82c1 to
329b2b7
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
923146b to
757ce75
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
54c1059 to
306f2d6
Compare
timgraham
force-pushed
the
django60
branch
3 times, most recently
from
3a27a24 to
8c303ca
Compare
timgraham
force-pushed
the
django60
branch
4 times, most recently
from
bec0ec5 to
251bea0
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
e2e35b4 to
47271df
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
fa88713 to
2b41c23
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
511628b to
c1549ec
Compare
timgraham
force-pushed
the
django60
branch
2 times, most recently
from
c52e2fa to
724347d
Compare
timgraham
force-pushed
the
django60
branch
3 times, most recently
from
9ec6d4c to
0ce64ca
Compare
timgraham
commented
Dec 8, 2025
Comment on lines
+31
to
+34
| except FullResultSet: | ||
| lhs_mql = source_expressions[0].as_mql(compiler, connection, as_expr=True) | ||
| except EmptyResultSet: | ||
| lhs_mql = Value(None).as_mql(compiler, connection, as_expr=True) |
Collaborator
Author
There was a problem hiding this comment.
aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_empty_condition uses the EmptyResultSet branch but aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_full_condition doesn't use the FullResultSet branch. I didn't analyze to tell whether another test is needed for that branch or if the FullResultSet branch isn't needed.
timgraham
commented
Dec 8, 2025
| node.set_source_expressions([Case(condition), *source_expressions[1:]]) | ||
| try: | ||
| lhs_mql = self.filter.as_mql(compiler, connection, as_expr=True) | ||
| except NotSupportedError: |
Collaborator
Author
There was a problem hiding this comment.
The NotSupportedError is "AggregateFilter may need an as_mql() method." It looks like we couldn't move this logic to AggregateFilter.as_mql() because the logic is different when AggregateFilter is used in count(), correct?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Django 6.0 was released December 3, 2025.