Permalink
Browse files

Fixed #22030 -- Don't assume that all fields have a swappable_setting…

… attribute.
  • Loading branch information...
1 parent c3434fe commit 6873eeeefbc3a081c98351ff25b4cdc42dbf3d7d @bmispelon bmispelon committed Feb 13, 2014
Showing with 22 additions and 1 deletion.
  1. +2 −1 django/db/migrations/autodetector.py
  2. +20 −0 tests/migrations/test_autodetector.py
@@ -233,7 +233,8 @@ def _detect_changes(self):
field=field,
)
)
- swappable_setting = new_apps.get_model(app_label, model_name)._meta.get_field_by_name(field_name)[0].swappable_setting
+ new_field = new_apps.get_model(app_label, model_name)._meta.get_field_by_name(field_name)[0]
+ swappable_setting = getattr(new_field, 'swappable_setting', None)
if swappable_setting is not None:
self.add_swappable_dependency(app_label, swappable_setting)
# Old fields
@@ -16,6 +16,7 @@ class AutodetectorTests(TestCase):
author_name = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=200))])
author_name_longer = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=400))])
author_name_renamed = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("names", models.CharField(max_length=200))])
+ author_name_default = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=200, default='Ada Lovelace'))])
author_with_book = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=200)), ("book", models.ForeignKey("otherapp.Book"))])
author_with_publisher = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=200)), ("publisher", models.ForeignKey("testapp.Publisher"))])
author_with_custom_user = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=200)), ("user", models.ForeignKey("thirdapp.CustomUser"))])
@@ -369,3 +370,22 @@ def test_swappable(self):
# Check the dependency is correct
migration = changes['testapp'][0]
self.assertEqual(migration.dependencies, [("__setting__", "AUTH_USER_MODEL")])
+
+ def test_add_field_with_default(self):
+ """
+ Adding a field with a default should work (#22030).
+ """
+ # Make state
+ before = self.make_project_state([self.author_empty])
+ after = self.make_project_state([self.author_name_default])
+ autodetector = MigrationAutodetector(before, after)
+ changes = autodetector._detect_changes()
+ # Right number of migrations?
+ self.assertEqual(len(changes['testapp']), 1)
+ # Right number of actions?
+ migration = changes['testapp'][0]
+ self.assertEqual(len(migration.operations), 1)
+ # Right action?
+ action = migration.operations[0]
+ self.assertEqual(action.__class__.__name__, "AddField")
+ self.assertEqual(action.name, "name")

0 comments on commit 6873eee

Please sign in to comment.