p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #21438: makemigrations now detects ManyToManyFields

This commit is contained in:
Andrew Godwin 2013-11-27 15:28:33 +00:00
parent 19b34fbe63
commit 5e63977c0e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/migrations/state.py
View File

@ -100,6 +100,10 @@ class ModelState(object):
name, path, args, kwargs = field.deconstruct() name, path, args, kwargs = field.deconstruct()
field_class = import_by_path(path) field_class = import_by_path(path)
fields.append((name, field_class(*args, **kwargs))) fields.append((name, field_class(*args, **kwargs)))
for field in model._meta.local_many_to_many:
name, path, args, kwargs = field.deconstruct()
field_class = import_by_path(path)
fields.append((name, field_class(*args, **kwargs)))
# Extract the options # Extract the options
options = {} options = {}
for name in DEFAULT_NAMES: for name in DEFAULT_NAMES:

4
tests/migrations/test_state.py
View File

@ -36,6 +36,7 @@ class StateTests(TestCase):
class Book(models.Model): class Book(models.Model):
title = models.CharField(max_length=1000) title = models.CharField(max_length=1000)
author = models.ForeignKey(Author) author = models.ForeignKey(Author)
contributors = models.ManyToManyField(Author)
class Meta: class Meta:
app_label = "migrations" app_label = "migrations"
@ -59,9 +60,10 @@ class StateTests(TestCase):
self.assertEqual(book_state.app_label, "migrations") self.assertEqual(book_state.app_label, "migrations")
self.assertEqual(book_state.name, "Book") self.assertEqual(book_state.name, "Book")
self.assertEqual([x for x, y in book_state.fields], ["id", "title", "author"]) self.assertEqual([x for x, y in book_state.fields], ["id", "title", "author", "contributors"])
self.assertEqual(book_state.fields[1][1].max_length, 1000) self.assertEqual(book_state.fields[1][1].max_length, 1000)
self.assertEqual(book_state.fields[2][1].null, False) self.assertEqual(book_state.fields[2][1].null, False)
self.assertEqual(book_state.fields[3][1].__class__.__name__, "ManyToManyField")
self.assertEqual(book_state.options, {"verbose_name": "tome", "db_table": "test_tome"}) self.assertEqual(book_state.options, {"verbose_name": "tome", "db_table": "test_tome"})
self.assertEqual(book_state.bases, (models.Model, )) self.assertEqual(book_state.bases, (models.Model, ))