mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Fixed #23341 -- Added migration name to nonexistent migration error in makemigrations.

Browse Source 
Backport of abd640fbdf from master
This commit is contained in:
Raffaele Salmaso
2014-08-22 09:26:06 +02:00
committed by Tim Graham
parent 4ae75cf051
commit 1a918806ca
4 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/migrations/graph.py
View File

@@ -35,11 +35,11 @@ class MigrationGraph(object):
def add_node(self, node, implementation): def add_node(self, node, implementation):
self.nodes[node] = implementation self.nodes[node] = implementation
def add_dependency(self, child, parent): def add_dependency(self, migration, child, parent):
if child not in self.nodes: if child not in self.nodes:
raise KeyError("Dependency references nonexistent child node %r" % (child,)) raise KeyError("Migration %s dependencies references nonexistent child node %r" % (migration, child))
if parent not in self.nodes: if parent not in self.nodes:
raise KeyError("Dependency references nonexistent parent node %r" % (parent,)) raise KeyError("Migration %s dependencies references nonexistent parent node %r" % (migration, parent))
self.dependencies.setdefault(child, set()).add(parent) self.dependencies.setdefault(child, set()).add(parent)
self.dependents.setdefault(parent, set()).add(child) self.dependents.setdefault(parent, set()).add(child)

6
django/db/migrations/loader.py
View File

@@ -230,7 +230,7 @@ class MigrationLoader(object):
if parent[0] != key[0] or parent[1] == '__first__': if parent[0] != key[0] or parent[1] == '__first__':
# Ignore __first__ references to the same app (#22325) # Ignore __first__ references to the same app (#22325)
continue continue
self.graph.add_dependency(key, parent) self.graph.add_dependency(migration, key, parent)
for key, migration in normal.items(): for key, migration in normal.items():
for parent in migration.dependencies: for parent in migration.dependencies:
if parent[0] == key[0]: if parent[0] == key[0]:
@@ -238,11 +238,11 @@ class MigrationLoader(object):
continue continue
parent = self.check_key(parent, key[0]) parent = self.check_key(parent, key[0])
if parent is not None: if parent is not None:
self.graph.add_dependency(key, parent) self.graph.add_dependency(migration, key, parent)
for child in migration.run_before: for child in migration.run_before:
child = self.check_key(child, key[0]) child = self.check_key(child, key[0])
if child is not None: if child is not None:
self.graph.add_dependency(child, key) self.graph.add_dependency(migration, child, key)
def detect_conflicts(self): def detect_conflicts(self):
""" """

4
tests/migrations/test_autodetector.py
View File

@@ -154,8 +154,8 @@ class AutodetectorTests(TestCase):
graph.add_node(("testapp", "0001_initial"), None) graph.add_node(("testapp", "0001_initial"), None)
graph.add_node(("testapp", "0002_foobar"), None) graph.add_node(("testapp", "0002_foobar"), None)
graph.add_node(("otherapp", "0001_initial"), None) graph.add_node(("otherapp", "0001_initial"), None)
graph.add_dependency(("testapp", "0002_foobar"), ("testapp", "0001_initial")) graph.add_dependency("testapp.0002_foobar", ("testapp", "0002_foobar"), ("testapp", "0001_initial"))
graph.add_dependency(("testapp", "0002_foobar"), ("otherapp", "0001_initial")) graph.add_dependency("testapp.0002_foobar", ("testapp", "0002_foobar"), ("otherapp", "0001_initial"))
# Use project state to make a new migration change set # Use project state to make a new migration change set
before = self.make_project_state([]) before = self.make_project_state([])
after = self.make_project_state([self.author_empty, self.other_pony, self.other_stable]) after = self.make_project_state([self.author_empty, self.other_pony, self.other_stable])

63
tests/migrations/test_graph.py
View File

@@ -23,11 +23,11 @@ class GraphTests(TestCase):
graph.add_node(("app_a", "0004"), None) graph.add_node(("app_a", "0004"), None)
graph.add_node(("app_b", "0001"), None) graph.add_node(("app_b", "0001"), None)
graph.add_node(("app_b", "0002"), None) graph.add_node(("app_b", "0002"), None)
graph.add_dependency(("app_a", "0004"), ("app_a", "0003")) graph.add_dependency("app_a.0004", ("app_a", "0004"), ("app_a", "0003"))
graph.add_dependency(("app_a", "0003"), ("app_a", "0002")) graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002"))
graph.add_dependency(("app_a", "0002"), ("app_a", "0001")) graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001"))
graph.add_dependency(("app_a", "0003"), ("app_b", "0002")) graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_b", "0002"))
graph.add_dependency(("app_b", "0002"), ("app_b", "0001")) graph.add_dependency("app_b.0002", ("app_b", "0002"), ("app_b", "0001"))
# Test root migration case # Test root migration case
self.assertEqual( self.assertEqual(
graph.forwards_plan(("app_a", "0001")), graph.forwards_plan(("app_a", "0001")),
@@ -78,15 +78,15 @@ class GraphTests(TestCase):
graph.add_node(("app_b", "0002"), None) graph.add_node(("app_b", "0002"), None)
graph.add_node(("app_c", "0001"), None) graph.add_node(("app_c", "0001"), None)
graph.add_node(("app_c", "0002"), None) graph.add_node(("app_c", "0002"), None)
graph.add_dependency(("app_a", "0004"), ("app_a", "0003")) graph.add_dependency("app_a.0004", ("app_a", "0004"), ("app_a", "0003"))
graph.add_dependency(("app_a", "0003"), ("app_a", "0002")) graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002"))
graph.add_dependency(("app_a", "0002"), ("app_a", "0001")) graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001"))
graph.add_dependency(("app_a", "0003"), ("app_b", "0002")) graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_b", "0002"))
graph.add_dependency(("app_b", "0002"), ("app_b", "0001")) graph.add_dependency("app_b.0002", ("app_b", "0002"), ("app_b", "0001"))
graph.add_dependency(("app_a", "0004"), ("app_c", "0002")) graph.add_dependency("app_a.0004", ("app_a", "0004"), ("app_c", "0002"))
graph.add_dependency(("app_c", "0002"), ("app_c", "0001")) graph.add_dependency("app_c.0002", ("app_c", "0002"), ("app_c", "0001"))
graph.add_dependency(("app_c", "0001"), ("app_b", "0001")) graph.add_dependency("app_c.0001", ("app_c", "0001"), ("app_b", "0001"))
graph.add_dependency(("app_c", "0002"), ("app_a", "0002")) graph.add_dependency("app_c.0002", ("app_c", "0002"), ("app_a", "0002"))
# Test branch C only # Test branch C only
self.assertEqual( self.assertEqual(
graph.forwards_plan(("app_c", "0002")), graph.forwards_plan(("app_c", "0002")),
@@ -123,11 +123,11 @@ class GraphTests(TestCase):
graph.add_node(("app_a", "0003"), None) graph.add_node(("app_a", "0003"), None)
graph.add_node(("app_b", "0001"), None) graph.add_node(("app_b", "0001"), None)
graph.add_node(("app_b", "0002"), None) graph.add_node(("app_b", "0002"), None)
graph.add_dependency(("app_a", "0003"), ("app_a", "0002")) graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002"))
graph.add_dependency(("app_a", "0002"), ("app_a", "0001")) graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001"))
graph.add_dependency(("app_a", "0001"), ("app_b", "0002")) graph.add_dependency("app_a.0001", ("app_a", "0001"), ("app_b", "0002"))
graph.add_dependency(("app_b", "0002"), ("app_b", "0001")) graph.add_dependency("app_b.0002", ("app_b", "0002"), ("app_b", "0001"))
graph.add_dependency(("app_b", "0001"), ("app_a", "0003")) graph.add_dependency("app_b.0001", ("app_b", "0001"), ("app_a", "0003"))
# Test whole graph # Test whole graph
self.assertRaises( self.assertRaises(
CircularDependencyError, CircularDependencyError,
@@ -146,3 +146,28 @@ class GraphTests(TestCase):
with self.assertRaisesMessage(ValueError, message): with self.assertRaisesMessage(ValueError, message):
graph.backwards_plan(("app_b", "0001")) graph.backwards_plan(("app_b", "0001"))
def test_missing_parent_nodes(self):
"""
Tests for missing parent nodes.
"""
# Build graph
graph = MigrationGraph()
graph.add_node(("app_a", "0001"), None)
graph.add_node(("app_a", "0002"), None)
graph.add_node(("app_a", "0003"), None)
graph.add_node(("app_b", "0001"), None)
graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002"))
graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001"))
with self.assertRaisesMessage(KeyError, "Migration app_a.0001 dependencies references nonexistent parent node ('app_b', '0002')"):
graph.add_dependency("app_a.0001", ("app_a", "0001"), ("app_b", "0002"))
def test_missing_child_nodes(self):
"""
Tests for missing child nodes.
"""
# Build graph
graph = MigrationGraph()
graph.add_node(("app_a", "0001"), None)
with self.assertRaisesMessage(KeyError, "Migration app_a.0002 dependencies references nonexistent child node ('app_a', '0002')"):
graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001"))