diff options
| author | Simon Charette <charettes@users.noreply.github.com> | 2020-05-29 04:24:37 -0400 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-05-29 10:25:20 +0200 |
| commit | aca675ad33c1673a464172182bc66d8cd16efaa5 (patch) | |
| tree | 0d1bf22decb37aa00060ae46f215f84f1ec8bbe6 | |
| parent | bd389a832aa1480fc76c3fb2bb6f92ea4209e378 (diff) | |
[3.1.x] Refs #21171 -- Made Collector.delete() rollback in the correct database.
Regression in c7dd8490b882b2cefdc7faf431dc64c532b79c9.
Backport of f8ef5f2c86683bef3b200fd864efc14f1fbbc23b from master
| -rw-r--r-- | django/db/models/deletion.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py index 90623437f5..3bdd89cbd9 100644 --- a/django/db/models/deletion.py +++ b/django/db/models/deletion.py @@ -392,7 +392,7 @@ class Collector: if len(self.data) == 1 and len(instances) == 1: instance = list(instances)[0] if self.can_fast_delete(instance): - with transaction.mark_for_rollback_on_error(): + with transaction.mark_for_rollback_on_error(self.using): count = sql.DeleteQuery(model).delete_batch([instance.pk], self.using) setattr(instance, model._meta.pk.attname, None) return count, {model._meta.label: count} |