Fixed #18556 - Allowed RelatedManager.add() to execute 1 query where possible. #4319
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
timgraham
force-pushed
the
18552-2
branch
3 times, most recently
from
6139a79
to
6e8e3af
Compare
|
|
||
| The ``add()`` method executes one query regardless of the number | ||
| of objects being added, (unless the objects have not yet been saved | ||
| to the database in which case that is done). In prior versions, it |
There was a problem hiding this comment.
I'd put the opening parenthesis before "in which case" instead of directly after the comma.
timgraham
force-pushed
the
18552-2
branch
3 times, most recently
from
768fc00
to
4e1cc7f
Compare
|
@loic, tests are passing, but not sure the changes in GFK are entirely correct/sufficient. Some more tests might be needed. Could you check? |
| @@ -36,7 +36,7 @@ Related objects reference | |||
| In this example, the methods below will be available both on | |||
| ``topping.pizza_set`` and on ``pizza.toppings``. | |||
|
|
|||
| .. method:: add(obj1, [obj2, ...]) | |||
| .. method:: add(obj1, [obj2, ..., bulk=False]) | |||
timgraham
force-pushed
the
18552-2
branch
4 times, most recently
from
6aa875a
to
9b4469d
Compare
timgraham
force-pushed
the
18552-2
branch
3 times, most recently
from
7340a82
to
947efb8
Compare
timgraham
force-pushed
the
18552-2
branch
2 times, most recently
from
05e0e5e
to
4c6043b
Compare
timgraham
force-pushed
the
18552-2
branch
5 times, most recently
from
7a71d70
to
8d0fc18
Compare
| setattr(obj, self.object_id_field_name, self.pk_val) | ||
| obj.save() | ||
| if obj._state.adding or obj._state.db != db: | ||
| raise ValueError("%r instance isn't saved, but must be." % obj) |
There was a problem hiding this comment.
This exception message is different from that in related.py though the logic/intention surrounding it seems to be the same. Is this intentional?
(FWIW, I find the message in related.py to be clearer)
timgraham
force-pushed
the
18552-2
branch
2 times, most recently
from
0da24ae
to
9324643
Compare
| setattr(obj, self.object_id_field_name, self.pk_val) | ||
|
|
||
| if bulk: | ||
| ids = [] |
… possible. Thanks Loic Bistuer for review.
|
Test failure seems unrelated. Left a couple of nitpick comments, otherwise PR looks great, I'm happy to merge it afterwards. |
|
Merged in adc0c4f. Sorry I took so long to give a final review ;) |
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.
https://code.djangoproject.com/ticket/18556