Fixed #35520 -- Used correct database for ModelAdmin transactions
#18268
+104
−6
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
RealOrangeOne
commented
Jun 11, 2024
django/contrib/admin/options.py
Outdated
| with transaction.atomic(using=router.db_for_write(self.model)): | ||
| db = ( | ||
| router.db_for_read(self.model) | ||
| if request.method in ("GET", "HEAD", "OPTIONS", "TRACE") |
There was a problem hiding this comment.
There isn't currently a util for whether the request's method is read-only, so I've had to duplicate this set of methods a fair bit. Not sure this is the point we want to extract them into a util?
charettes
reviewed
Jun 11, 2024
RealOrangeOne
force-pushed
the
35520-modeladmin-transaction
branch
from
145f623
to
fefc3b7
Compare
RealOrangeOne
force-pushed
the
35520-modeladmin-transaction
branch
from
fefc3b7
to
301e1a7
Compare
sarahboyce
reviewed
Jun 17, 2024
RealOrangeOne
force-pushed
the
35520-modeladmin-transaction
branch
from
301e1a7
to
d7f5bba
Compare
RealOrangeOne
force-pushed
the
35520-modeladmin-transaction
branch
2 times, most recently
from
c094064
to
e43fa94
Compare
sarahboyce
reviewed
Jun 19, 2024
RealOrangeOne
force-pushed
the
35520-modeladmin-transaction
branch
from
e43fa94
to
a05c7c3
Compare
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.
Trac ticket number
ticket-35520
Branch description
In
ModelAdmin.delete_viewandModelAdmin.changelist_view, the transaction is hardcoded to usedb_for_write, even if the request is read-only (egGET). This potentially results in the wrong database being selected (or errors ifdb_for_writeis used to prevent writing to models).This PR uses
db_for_readfor any read requests, based on the method. Most users won't notice the difference, as the same database will be selected. But those who are using a custom router will get the database they expect.Checklist
mainbranch.