Fixed #28378 -- Fixed union(), and difference() when combining with queryset raising EmptyResultSet exception. #8721
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
charettes
approved these changes
Jul 9, 2017
django/db/models/sql/compiler.py
Outdated
There was a problem hiding this comment.
I haven't checked out the patch locally but were these changes necessary for the patch to work?
There was a problem hiding this comment.
Yes. EmptyResultSet exception is raised here, therefore I decided to move these variables inside the if clause where they are used.
892a379 to
639cd33
Compare
|
@charettes Thanks for review. I added release notes. |
timgraham
approved these changes
Jul 10, 2017
docs/releases/1.11.4.txt
Outdated
docs/releases/1.11.4.txt
Outdated
django/db/models/sql/compiler.py
Outdated
There was a problem hiding this comment.
with UNION and with DIFFERENCE if the first queryset is nonempty.
django/db/models/sql/compiler.py
Outdated
There was a problem hiding this comment.
I'd chop the blank lines around for_update_part.
django/db/models/sql/compiler.py
Outdated
|
@timgraham Thanks for review. |
…queryset raising EmptyResultSet. Thanks Jon Dufresne for the report. Thanks Tim Graham and Simon Charette for the reviews.
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.
https://code.djangoproject.com/ticket/28378