mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[1.7.x] Fixed #23341 -- Added migration name to nonexistent migration error in makemigrations.
Backport of abd640fbdf from master
			
			
This commit is contained in:
		
				
					committed by
					
						 Tim Graham
						Tim Graham
					
				
			
			
				
	
			
			
			
						parent
						
							4ae75cf051
						
					
				
				
					commit
					1a918806ca
				
			| @@ -23,11 +23,11 @@ class GraphTests(TestCase): | ||||
|         graph.add_node(("app_a", "0004"), None) | ||||
|         graph.add_node(("app_b", "0001"), None) | ||||
|         graph.add_node(("app_b", "0002"), None) | ||||
|         graph.add_dependency(("app_a", "0004"), ("app_a", "0003")) | ||||
|         graph.add_dependency(("app_a", "0003"), ("app_a", "0002")) | ||||
|         graph.add_dependency(("app_a", "0002"), ("app_a", "0001")) | ||||
|         graph.add_dependency(("app_a", "0003"), ("app_b", "0002")) | ||||
|         graph.add_dependency(("app_b", "0002"), ("app_b", "0001")) | ||||
|         graph.add_dependency("app_a.0004", ("app_a", "0004"), ("app_a", "0003")) | ||||
|         graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002")) | ||||
|         graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001")) | ||||
|         graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_b", "0002")) | ||||
|         graph.add_dependency("app_b.0002", ("app_b", "0002"), ("app_b", "0001")) | ||||
|         # Test root migration case | ||||
|         self.assertEqual( | ||||
|             graph.forwards_plan(("app_a", "0001")), | ||||
| @@ -78,15 +78,15 @@ class GraphTests(TestCase): | ||||
|         graph.add_node(("app_b", "0002"), None) | ||||
|         graph.add_node(("app_c", "0001"), None) | ||||
|         graph.add_node(("app_c", "0002"), None) | ||||
|         graph.add_dependency(("app_a", "0004"), ("app_a", "0003")) | ||||
|         graph.add_dependency(("app_a", "0003"), ("app_a", "0002")) | ||||
|         graph.add_dependency(("app_a", "0002"), ("app_a", "0001")) | ||||
|         graph.add_dependency(("app_a", "0003"), ("app_b", "0002")) | ||||
|         graph.add_dependency(("app_b", "0002"), ("app_b", "0001")) | ||||
|         graph.add_dependency(("app_a", "0004"), ("app_c", "0002")) | ||||
|         graph.add_dependency(("app_c", "0002"), ("app_c", "0001")) | ||||
|         graph.add_dependency(("app_c", "0001"), ("app_b", "0001")) | ||||
|         graph.add_dependency(("app_c", "0002"), ("app_a", "0002")) | ||||
|         graph.add_dependency("app_a.0004", ("app_a", "0004"), ("app_a", "0003")) | ||||
|         graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002")) | ||||
|         graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001")) | ||||
|         graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_b", "0002")) | ||||
|         graph.add_dependency("app_b.0002", ("app_b", "0002"), ("app_b", "0001")) | ||||
|         graph.add_dependency("app_a.0004", ("app_a", "0004"), ("app_c", "0002")) | ||||
|         graph.add_dependency("app_c.0002", ("app_c", "0002"), ("app_c", "0001")) | ||||
|         graph.add_dependency("app_c.0001", ("app_c", "0001"), ("app_b", "0001")) | ||||
|         graph.add_dependency("app_c.0002", ("app_c", "0002"), ("app_a", "0002")) | ||||
|         # Test branch C only | ||||
|         self.assertEqual( | ||||
|             graph.forwards_plan(("app_c", "0002")), | ||||
| @@ -123,11 +123,11 @@ class GraphTests(TestCase): | ||||
|         graph.add_node(("app_a", "0003"), None) | ||||
|         graph.add_node(("app_b", "0001"), None) | ||||
|         graph.add_node(("app_b", "0002"), None) | ||||
|         graph.add_dependency(("app_a", "0003"), ("app_a", "0002")) | ||||
|         graph.add_dependency(("app_a", "0002"), ("app_a", "0001")) | ||||
|         graph.add_dependency(("app_a", "0001"), ("app_b", "0002")) | ||||
|         graph.add_dependency(("app_b", "0002"), ("app_b", "0001")) | ||||
|         graph.add_dependency(("app_b", "0001"), ("app_a", "0003")) | ||||
|         graph.add_dependency("app_a.0003", ("app_a", "0003"), ("app_a", "0002")) | ||||
|         graph.add_dependency("app_a.0002", ("app_a", "0002"), ("app_a", "0001")) | ||||
|         graph.add_dependency("app_a.0001", ("app_a", "0001"), ("app_b", "0002")) | ||||
|         graph.add_dependency("app_b.0002", ("app_b", "0002"), ("app_b", "0001")) | ||||
|         graph.add_dependency("app_b.0001", ("app_b", "0001"), ("app_a", "0003")) | ||||
|         # Test whole graph | ||||
|         self.assertRaises( | ||||
|             CircularDependencyError, | ||||
| @@ -146,3 +146,28 @@ class GraphTests(TestCase): | ||||
|  | ||||
|         with self.assertRaisesMessage(ValueError, message): | ||||
|             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")) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user