innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #29899 -- Improved variable names in MigrationAutodetector._detect_changes().

This commit is contained in:
David Wobrock 2020-03-28 20:32:02 +01:00 committed by Mariusz Felisiak
parent fd325b9dee
commit a67849499a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,28 +131,28 @@ class MigrationAutodetector:
self.new_model_keys = set() self.new_model_keys = set()
self.new_proxy_keys = set() self.new_proxy_keys = set()
self.new_unmanaged_keys = set() self.new_unmanaged_keys = set()
for al, mn in self.from_state.models: for app_label, model_name in self.from_state.models:
model = self.old_apps.get_model(al, mn) model = self.old_apps.get_model(app_label, model_name)
if not model._meta.managed: if not model._meta.managed:
self.old_unmanaged_keys.add((al, mn)) self.old_unmanaged_keys.add((app_label, model_name))
elif al not in self.from_state.real_apps: elif app_label not in self.from_state.real_apps:
if model._meta.proxy: if model._meta.proxy:
self.old_proxy_keys.add((al, mn)) self.old_proxy_keys.add((app_label, model_name))
else: else:
self.old_model_keys.add((al, mn)) self.old_model_keys.add((app_label, model_name))
for al, mn in self.to_state.models: for app_label, model_name in self.to_state.models:
model = self.new_apps.get_model(al, mn) model = self.new_apps.get_model(app_label, model_name)
if not model._meta.managed: if not model._meta.managed:
self.new_unmanaged_keys.add((al, mn)) self.new_unmanaged_keys.add((app_label, model_name))
elif ( elif (
al not in self.from_state.real_apps or app_label not in self.from_state.real_apps or
(convert_apps and al in convert_apps) (convert_apps and app_label in convert_apps)
): ):
if model._meta.proxy: if model._meta.proxy:
self.new_proxy_keys.add((al, mn)) self.new_proxy_keys.add((app_label, model_name))
else: else:
self.new_model_keys.add((al, mn)) self.new_model_keys.add((app_label, model_name))
# Renames have to come first # Renames have to come first
self.generate_renamed_models() self.generate_renamed_models()