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

[1.7.x] Corrected grammar in migrations error message. 

Backport of 61f56e239f from master
This commit is contained in:
Markus Bertheau 2014-09-10 22:54:28 +09:00 committed by Tim Graham
parent 67872bfff1
commit 35cd0854f9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,9 +37,9 @@ class MigrationGraph(object):
def add_dependency(self, migration, child, parent):
if child not in self.nodes:
raise KeyError("Migration %s dependencies references nonexistent child node %r" % (migration, child))
raise KeyError("Migration %s dependencies reference nonexistent child node %r" % (migration, child))
if parent not in self.nodes:
raise KeyError("Migration %s dependencies references nonexistent parent node %r" % (migration, parent))
raise KeyError("Migration %s dependencies reference nonexistent parent node %r" % (migration, parent))
self.dependencies.setdefault(child, set()).add(parent)
self.dependents.setdefault(parent, set()).add(child)

6
tests/migrations/test_graph.py
View File

@ -174,7 +174,8 @@ class GraphTests(TestCase):
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')"):
msg = "Migration app_a.0001 dependencies reference nonexistent parent node ('app_b', '0002')"
with self.assertRaisesMessage(KeyError, msg):
graph.add_dependency("app_a.0001", ("app_a", "0001"), ("app_b", "0002"))
def test_missing_child_nodes(self):
@ -184,5 +185,6 @@ class GraphTests(TestCase):
# 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')"):
msg = "Migration app_a.0002 dependencies reference nonexistent child node ('app_a', '0002')"
with self.assertRaisesMessage(KeyError, msg):
graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001"))