diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2014-03-06 11:35:58 -0800 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2014-03-06 11:35:58 -0800 |
| commit | 1562b9896f8f614ef40fd032b1ec777280b377c1 (patch) | |
| tree | 4e5032517b90bdc3f46a03b8fc4ddb343d61128c | |
| parent | 34236efc5e569ce7d42f7d52dd798e59f95457f8 (diff) | |
Fixed #22183: Don't make a table for M2Ms with through=
| -rw-r--r-- | django/db/backends/schema.py | 3 | ||||
| -rw-r--r-- | django/db/models/fields/related.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py index afc60c30b1..7054633b81 100644 --- a/django/db/backends/schema.py +++ b/django/db/backends/schema.py @@ -262,7 +262,8 @@ class BaseDatabaseSchemaEditor(object): }) # Make M2M tables for field in model._meta.local_many_to_many: - self.create_model(field.rel.through) + if field.rel.through._meta.auto_created: + self.create_model(field.rel.through) def delete_model(self, model): """ diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index e7b66217c5..16de0bfc74 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -2032,6 +2032,8 @@ class ManyToManyField(RelatedField): kwargs['to'] = self.rel.to else: kwargs['to'] = "%s.%s" % (self.rel.to._meta.app_label, self.rel.to._meta.object_name) + if getattr(self.rel, 'through', None) is not None: + kwargs['through'] = self.rel.through # If swappable is True, then see if we're actually pointing to the target # of a swap. swappable_setting = self.swappable_setting |
