p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #21171 -- Made Collector.delete() rollback in the correct database. 

Regression in c7dd8490b882b2cefdc7faf431dc64c532b79c9.
This commit is contained in:
Simon Charette 2020-05-29 04:24:37 -04:00 committed by GitHub
parent 0382ecfe02
commit f8ef5f2c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/deletion.py
View File

@ -392,7 +392,7 @@ class Collector:
if len(self.data) == 1 and len(instances) == 1: if len(self.data) == 1 and len(instances) == 1:
instance = list(instances)[0] instance = list(instances)[0]
if self.can_fast_delete(instance): 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) count = sql.DeleteQuery(model).delete_batch([instance.pk], self.using)
setattr(instance, model._meta.pk.attname, None) setattr(instance, model._meta.pk.attname, None)
return count, {model._meta.label: count} return count, {model._meta.label: count}