mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-06 20:19:13 +00:00
Code Issues 32 Releases Wiki Activity

Refs #18012 -- Removed special casing for proxy models deletion.

Browse Source 
This isn't required anymore now that reverse foreign keys
from proxy models are propagated to their concrete model.
This commit is contained in:
Simon Charette 2015-10-07 14:04:57 -04:00
parent 6c9f37ea9e
commit 8bdfabed65
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
from collections import Counter, OrderedDict from collections import Counter, OrderedDict
from itertools import chain
from operator import attrgetter from operator import attrgetter
from django.db import IntegrityError, connections, transaction from django.db import IntegrityError, connections, transaction
@ -53,18 +52,10 @@ def DO_NOTHING(collector, field, sub_objs, using):
def get_candidate_relations_to_delete(opts): def get_candidate_relations_to_delete(opts):
# Collect models that contain candidate relations to delete. This may include
# relations coming from proxy models.
candidate_models = {opts}
candidate_models = candidate_models.union(opts.concrete_model._meta.proxied_children)
# For each model, get all candidate fields.
candidate_model_fields = chain.from_iterable(
opts.get_fields(include_hidden=True) for opts in candidate_models
)
# The candidate relations are the ones that come from N-1 and 1-1 relations. # The candidate relations are the ones that come from N-1 and 1-1 relations.
# N-N (i.e., many-to-many) relations aren't candidates for deletion. # N-N (i.e., many-to-many) relations aren't candidates for deletion.
return ( return (
f for f in candidate_model_fields f for f in opts.get_fields(include_hidden=True)
if f.auto_created and not f.concrete and (f.one_to_one or f.one_to_many) if f.auto_created and not f.concrete and (f.one_to_one or f.one_to_many)
) )