19644 Make atomic use correct database instead of default #19651
+45
−42
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
jeremystretch
requested changes
Jun 19, 2025
jeremystretch
requested changes
Jun 24, 2025
jeremystretch
approved these changes
Jun 25, 2025
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.
Fixes: #19644
transaction.atomic will go to the default database, this is normally not a problem but if multiple schemas are databases are configured using a router (like with the branching plugin) this will be incorrect as the atomic wrapper should be done on the database the changes are made on.
In jobs.py the script running code is a special case as the script could potentially modify models in multiple schemas so both the default database needs a wrapper and any model specific ones - arbitrarily used device as the model to key off, but any ChangeLogged model could be used.