Fixed #21114 -- Migrations must not have a dependency to themselves. (5a424c23) · Commits · Dom Sekotill / django

django/db/migrations/autodetector.py

+4 −2

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ class MigrationAutodetector(object):
		)
		)
		for field_name, other_app_label, other_model_name in related_fields:
		if app_label != other_app_label:
		self.add_dependency(app_label, other_app_label)
		del pending_add[app_label, model_name]
		# Ah well, we'll need to split one. Pick deterministically.
		@@ -140,6 +141,7 @@ class MigrationAutodetector(object):
		),
		new = True,
		)
		if app_label != other_app_label:
		self.add_dependency(app_label, other_app_label)
		# Removing models
		removed_models = set(old_model_keys) - set(new_model_keys)

tests/migrations/test_autodetector.py

+55 −0

Original line number	Diff line number	Diff line
		@@ -16,8 +16,11 @@ class AutodetectorTests(TestCase):
		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_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_proxy = ModelState("testapp", "AuthorProxy", [], {"proxy": True}, ("testapp.author", ))
		author_proxy_notproxy = ModelState("testapp", "AuthorProxy", [], {}, ("testapp.author", ))
		publisher = ModelState("testapp", "Publisher", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=100))])
		publisher_with_author = ModelState("testapp", "Publisher", [("id", models.AutoField(primary_key=True)), ("author", models.ForeignKey("testapp.Author")), ("name", models.CharField(max_length=100))])
		other_pony = ModelState("otherapp", "Pony", [("id", models.AutoField(primary_key=True))])
		other_stable = ModelState("otherapp", "Stable", [("id", models.AutoField(primary_key=True))])
		third_thing = ModelState("thirdapp", "Thing", [("id", models.AutoField(primary_key=True))])
		@@ -205,6 +208,29 @@ class AutodetectorTests(TestCase):
		self.assertEqual(migration2.dependencies, [("testapp", "auto_1")])
		self.assertEqual(migration3.dependencies, [("otherapp", "auto_1")])

		def test_same_app_no_fk_dependency(self):
		"""
		Tests that a migration with a FK between two models of the same app
		does not have a dependency to itself.
		"""
		# Make state
		before = self.make_project_state([])
		after = self.make_project_state([self.author_with_publisher, self.publisher])
		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), 2)
		# Right actions?
		action = migration.operations[0]
		self.assertEqual(action.__class__.__name__, "CreateModel")
		action = migration.operations[1]
		self.assertEqual(action.__class__.__name__, "CreateModel")
		# Right dependencies?
		self.assertEqual(migration.dependencies, [])

		def test_circular_fk_dependency(self):
		"""
		Tests that having a circular ForeignKey dependency automatically
		@@ -239,6 +265,35 @@ class AutodetectorTests(TestCase):
		self.assertEqual(migration2.dependencies, [])
		self.assertEqual(set(migration3.dependencies), set([("otherapp", "auto_1"), ("testapp", "auto_1")]))

		def test_same_app_circular_fk_dependency(self):
		"""
		Tests that a migration with a FK between two models of the same app
		does not have a dependency to itself.
		"""
		# Make state
		before = self.make_project_state([])
		after = self.make_project_state([self.author_with_publisher, self.publisher_with_author])
		autodetector = MigrationAutodetector(before, after)
		changes = autodetector._detect_changes()
		# Right number of migrations?
		self.assertEqual(len(changes['testapp']), 2)
		# Right number of actions?
		migration1 = changes['testapp'][0]
		self.assertEqual(len(migration1.operations), 2)
		migration2 = changes['testapp'][1]
		self.assertEqual(len(migration2.operations), 1)
		# Right actions?
		action = migration1.operations[0]
		self.assertEqual(action.__class__.__name__, "CreateModel")
		action = migration1.operations[1]
		self.assertEqual(action.__class__.__name__, "CreateModel")
		action = migration2.operations[0]
		self.assertEqual(action.__class__.__name__, "AddField")
		self.assertEqual(action.name, "publisher")
		# Right dependencies?
		self.assertEqual(migration1.dependencies, [])
		self.assertEqual(migration2.dependencies, [("testapp", "auto_1")])

		def test_unique_together(self):
		"Tests unique_together detection"
		# Make state