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

Refs #29897 -- Moved autodetector swappable dependency resolution to a method.

This commit is contained in:
Simon Charette 2018-10-28 20:02:34 -04:00 committed by Tim Graham
parent f1855fd885
commit 82353ef940
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
django/db/migrations/autodetector.py
View File

@ -237,6 +237,17 @@ class MigrationAutodetector:
) )
self.through_users[through_key] = (app_label, old_model_name, field_name) self.through_users[through_key] = (app_label, old_model_name, field_name)
@staticmethod
def _resolve_dependency(dependency):
"""
Return the resolved dependency and a boolean denoting whether or not
it was swappable.
"""
if dependency[0] != '__setting__':
return dependency, False
resolved_app_label, resolved_object_name = getattr(settings, dependency[1]).split('.')
return (resolved_app_label, resolved_object_name.lower()) + dependency[2:], True
def _build_migration_list(self, graph=None): def _build_migration_list(self, graph=None):
""" """
Chop the lists of operations up into migrations with dependencies on Chop the lists of operations up into migrations with dependencies on
@ -265,15 +276,12 @@ class MigrationAutodetector:
deps_satisfied = True deps_satisfied = True
operation_dependencies = set() operation_dependencies = set()
for dep in operation._auto_deps: for dep in operation._auto_deps:
is_swappable_dep = dep[0] == '__setting__' # Temporarily resolve the swappable dependency to
if is_swappable_dep: # prevent circular references. While keeping the
# We need to temporarily resolve the swappable dependency to prevent # dependency checks on the resolved model, add the
# circular references. While keeping the dependency checks on the # swappable dependencies.
# resolved model we still add the swappable dependencies. original_dep = dep
# See #23322 dep, is_swappable_dep = self._resolve_dependency(dep)
resolved_app_label, resolved_object_name = getattr(settings, dep[1]).split('.')
original_dep = dep
dep = (resolved_app_label, resolved_object_name.lower(), dep[2], dep[3])
if dep[0] != app_label: if dep[0] != app_label:
# External app dependency. See if it's not yet # External app dependency. See if it's not yet
# satisfied. # satisfied.