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

Removed some now dead code from deletion (thanks to Carl Meyer for noticing it).

This commit is contained in:
Alex Gaynor 2013-01-11 20:59:29 -08:00
parent bcdb4898ca
commit a170c3f755
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ class Collector(object):
self.using = using self.using = using
# Initially, {model: set([instances])}, later values become lists. # Initially, {model: set([instances])}, later values become lists.
self.data = {} self.data = {}
self.batches = {} # {model: {field: set([instances])}}
self.field_updates = {} # {model: {(field, value): set([instances])}} self.field_updates = {} # {model: {(field, value): set([instances])}}
# fast_deletes is a list of queryset-likes that can be deleted without # fast_deletes is a list of queryset-likes that can be deleted without
# fetching the objects into memory. # fetching the objects into memory.
@ -115,13 +114,6 @@ class Collector(object):
source._meta.concrete_model, set()).add(model._meta.concrete_model) source._meta.concrete_model, set()).add(model._meta.concrete_model)
return new_objs return new_objs
def add_batch(self, model, field, objs):
"""
Schedules a batch delete. Every instance of 'model' that is related to
an instance of 'obj' through 'field' will be deleted.
"""
self.batches.setdefault(model, {}).setdefault(field, set()).update(objs)
def add_field_update(self, field, value, objs): def add_field_update(self, field, value, objs):
""" """
Schedules a field update. 'objs' must be a homogenous iterable Schedules a field update. 'objs' must be a homogenous iterable
@ -303,12 +295,6 @@ class Collector(object):
for instances in six.itervalues(self.data): for instances in six.itervalues(self.data):
instances.reverse() instances.reverse()
# delete batches
for model, batches in six.iteritems(self.batches):
query = sql.DeleteQuery(model)
for field, instances in six.iteritems(batches):
query.delete_batch([obj.pk for obj in instances], self.using, field)
# delete instances # delete instances
for model, instances in six.iteritems(self.data): for model, instances in six.iteritems(self.data):
query = sql.DeleteQuery(model) query = sql.DeleteQuery(model)