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

Fixed #22183: Don't make a table for M2Ms with through=

This commit is contained in:
Andrew Godwin 2014-03-06 11:35:58 -08:00
parent 34236efc5e
commit 1562b9896f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/schema.py
View File

@ -262,7 +262,8 @@ class BaseDatabaseSchemaEditor(object):
}) })
# Make M2M tables # Make M2M tables
for field in model._meta.local_many_to_many: 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): def delete_model(self, model):
""" """

2
django/db/models/fields/related.py
View File

@ -2032,6 +2032,8 @@ class ManyToManyField(RelatedField):
kwargs['to'] = self.rel.to kwargs['to'] = self.rel.to
else: else:
kwargs['to'] = "%s.%s" % (self.rel.to._meta.app_label, self.rel.to._meta.object_name) 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 # If swappable is True, then see if we're actually pointing to the target
# of a swap. # of a swap.
swappable_setting = self.swappable_setting swappable_setting = self.swappable_setting