diff --git a/django/db/migrations/operations/fields.py b/django/db/migrations/operations/fields.py index efb12b22c3b9d..862716a3470d4 100644 --- a/django/db/migrations/operations/fields.py +++ b/django/db/migrations/operations/fields.py @@ -15,14 +15,13 @@ def state_forwards(self, app_label, state): state.models[app_label, self.model_name.lower()].fields.append((self.name, self.instance)) def database_forwards(self, app_label, schema_editor, from_state, to_state): - app_cache = to_state.render() - model = app_cache.get_model(app_label, self.model_name) - schema_editor.add_field(model, model._meta.get_field_by_name(self.name)[0]) + from_model = from_state.render().get_model(app_label, self.model_name) + to_model = to_state.render().get_model(app_label, self.model_name) + schema_editor.add_field(from_model, to_model._meta.get_field_by_name(self.name)[0]) def database_backwards(self, app_label, schema_editor, from_state, to_state): - app_cache = from_state.render() - model = app_cache.get_model(app_label, self.model_name) - schema_editor.remove_field(model, model._meta.get_field_by_name(self.name)[0]) + from_model = from_state.render().get_model(app_label, self.model_name) + schema_editor.remove_field(from_model, from_model._meta.get_field_by_name(self.name)[0]) class RemoveField(Operation): @@ -42,11 +41,10 @@ def state_forwards(self, app_label, state): state.models[app_label, self.model_name.lower()].fields = new_fields def database_forwards(self, app_label, schema_editor, from_state, to_state): - app_cache = from_state.render() - model = app_cache.get_model(app_label, self.model_name) - schema_editor.remove_field(model, model._meta.get_field_by_name(self.name)[0]) + from_model = from_state.render().get_model(app_label, self.model_name) + schema_editor.remove_field(from_model, from_model._meta.get_field_by_name(self.name)[0]) def database_backwards(self, app_label, schema_editor, from_state, to_state): - app_cache = to_state.render() - model = app_cache.get_model(app_label, self.model_name) - schema_editor.add_field(model, model._meta.get_field_by_name(self.name)[0]) + from_model = from_state.render().get_model(app_label, self.model_name) + to_model = to_state.render().get_model(app_label, self.model_name) + schema_editor.add_field(from_model, to_model._meta.get_field_by_name(self.name)[0])