From a44fc008c4e38fadef04021fdba564949f1aee3a Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 28 Sep 2016 10:04:52 -0400 Subject: Fixed #27217 -- Fixed crash in CreateModel optimization with models that use mixins. Thanks Simon Charette for review. --- django/db/migrations/operations/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py index a0e81f5e83..027ebfe95a 100644 --- a/django/db/migrations/operations/models.py +++ b/django/db/migrations/operations/models.py @@ -109,7 +109,10 @@ class CreateModel(ModelOperation): return True # Check we didn't inherit from the model - models_to_check = [base for base in self.bases if base is not models.Model] + models_to_check = [ + base for base in self.bases + if base is not models.Model and isinstance(base, (models.base.ModelBase, six.string_types)) + ] # Check we have no FKs/M2Ms with it for fname, field in self.fields: if field.remote_field: -- cgit v1.3