Refactor Aggregation and Count implementations #457
Merged
+27
−30
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
WaVEV
force-pushed
the
refactor-aggregation-methods
branch
from
8608039 to
5bcf02f
Compare
Collaborator
|
The MQL has changed slightly (e.g. $$REMOVE was not present before), correct? Maybe it's best to limit this to the 6.0 and not include it in 5.2, just in case of any regressions. If we put in in the 6.0 release only, I think a release note isn't needed. |
Clean up logic for better alignment with changes in Django 6.0.
timgraham
force-pushed
the
refactor-aggregation-methods
branch
from
5bcf02f to
4761579
Compare
timgraham
changed the title
timgraham
approved these changes
Dec 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This refactor cleans up the aggregation logic for clarity, maintainability, and better alignment with Django 6.
It replaces ad-hoc node copying and manual expression rewiring with explicit Case/When/WhereNode constructs and a new
Removeexpression for skipping rows.distinct and filter handling are unified, nullable values logic is simplified, and MQL generation is more consistent.
This makes the aggregation code reduces duplication and prepares the backend for Django 6 updates.