diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2014-02-12 17:22:50 +0000 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2014-02-12 17:22:50 +0000 |
| commit | bad9456b9cabd6a14fe6e3edeacde55b51fbffdc (patch) | |
| tree | 7adeff2dcfd0a58f194090541ad2932e396fbcd7 | |
| parent | 80bbe2265d1afd43f8519427ad8ce0b147aceb43 (diff) | |
Fix my slightly hasty autodetector changes
| -rw-r--r-- | django/db/migrations/autodetector.py | 9 | ||||
| -rw-r--r-- | tests/migrations/test_autodetector.py | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index 833c81d31b..2b8759b29a 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -31,7 +31,7 @@ class MigrationAutodetector(object): to try and restrict to (restriction is not guaranteed) """ changes = self._detect_changes() - changes = self._arrange_for_graph(changes, graph) + changes = self.arrange_for_graph(changes, graph) if trim_to_apps: changes = self._trim_to_apps(changes, trim_to_apps) return changes @@ -299,7 +299,7 @@ class MigrationAutodetector(object): dependency = ("__setting__", setting_name) self.migrations[app_label][-1].dependencies.append(dependency) - def _arrange_for_graph(self, changes, graph): + def arrange_for_graph(self, changes, graph): """ Takes in a result from changes() and a MigrationGraph, and fixes the names and dependencies of the changes so they @@ -388,8 +388,9 @@ class MigrationAutodetector(object): return "%s_%s" % (ops[0].model_name.lower(), ops[0].name.lower()) elif isinstance(ops[0], operations.RemoveField): return "remove_%s_%s" % (ops[0].model_name.lower(), ops[0].name.lower()) - elif all(isinstance(o, operations.CreateModel) for o in ops): - return "_".join(sorted(o.name.lower() for o in ops)) + elif len(ops) > 1: + if all(isinstance(o, operations.CreateModel) for o in ops): + return "_".join(sorted(o.name.lower() for o in ops)) return "auto_%s" % datetime.datetime.now().strftime("%Y%m%d_%H%M") @classmethod diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index 013a0d2287..dca971dd8e 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -54,7 +54,7 @@ class AutodetectorTests(TestCase): autodetector = MigrationAutodetector(before, after) changes = autodetector._detect_changes() # Run through arrange_for_graph - changes = autodetector._arrange_for_graph(changes, graph) + changes = autodetector.arrange_for_graph(changes, graph) # Make sure there's a new name, deps match, etc. self.assertEqual(changes["testapp"][0].name, "0003_author") self.assertEqual(changes["testapp"][0].dependencies, [("testapp", "0002_foobar")]) @@ -70,7 +70,7 @@ class AutodetectorTests(TestCase): changes = autodetector._detect_changes() # Run through arrange_for_graph graph = MigrationGraph() - changes = autodetector._arrange_for_graph(changes, graph) + changes = autodetector.arrange_for_graph(changes, graph) changes["testapp"][0].dependencies.append(("otherapp", "0001_initial")) changes = autodetector._trim_to_apps(changes, set(["testapp"])) # Make sure there's the right set of migrations |