From d7ab2cefb7ec94bf45d37a02c79b6703ea2880e5 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 24 Sep 2014 15:49:30 -0400 Subject: Revert "Fixed #23474 -- Prevented migrating backwards from unapplying the wrong migrations." This reverts commit abcf28a07695a45cb5fb15b81bffc97bea5e0be3. --- tests/migrations/test_executor.py | 38 ---------------------- .../test_migrations_backwards_deps_1/__init__.py | 0 .../0001_initial.py | 16 --------- .../test_migrations_backwards_deps_2/__init__.py | 0 4 files changed, 54 deletions(-) delete mode 100644 tests/migrations/test_migrations_backwards_deps_1/__init__.py delete mode 100644 tests/migrations2/test_migrations_backwards_deps_2/0001_initial.py delete mode 100644 tests/migrations2/test_migrations_backwards_deps_2/__init__.py (limited to 'tests') diff --git a/tests/migrations/test_executor.py b/tests/migrations/test_executor.py index 222f1b847e..b8eddc6f97 100644 --- a/tests/migrations/test_executor.py +++ b/tests/migrations/test_executor.py @@ -231,41 +231,3 @@ class ExecutorTests(MigrationTestBase): executor.migrate([("migrations", None)]) self.assertTableNotExists("migrations_author") self.assertTableNotExists("migrations_tribble") - - @override_settings( - MIGRATION_MODULES={ - "migrations": "migrations.test_migrations_backwards_deps_1", - "migrations2": "migrations2.test_migrations_backwards_deps_2", - }, - ) - def test_backwards_deps(self): - """ - #23474 - Migrating backwards shouldn't cause the wrong migrations to be - unapplied. - - Migration dependencies (x -> y === y depends on x): - m.0001 -+-> m.0002 - +-> m2.0001 - - 1) Migrate m2 to 0001, causing { m.0001, m2.0002 } to be applied. - 2) Migrate m to 0001. m.0001 has already been applied, so this should - be a noop. - """ - executor = MigrationExecutor(connection) - executor.migrate([("migrations2", "0001_initial")]) - try: - self.assertTableExists("migrations2_example") - # Rebuild the graph to reflect the new DB state - executor.loader.build_graph() - self.assertEqual( - executor.migration_plan([("migrations", "0001_initial")]), - [], - ) - executor.migrate([("migrations", "0001_initial")]) - self.assertTableExists("migrations2_example") - finally: - # And migrate back to clean up the database - executor.loader.build_graph() - executor.migrate([("migrations", None)]) - self.assertTableNotExists("migrations_author") - self.assertTableNotExists("migrations_tribble") diff --git a/tests/migrations/test_migrations_backwards_deps_1/__init__.py b/tests/migrations/test_migrations_backwards_deps_1/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/migrations2/test_migrations_backwards_deps_2/0001_initial.py b/tests/migrations2/test_migrations_backwards_deps_2/0001_initial.py deleted file mode 100644 index 0b6eafb02f..0000000000 --- a/tests/migrations2/test_migrations_backwards_deps_2/0001_initial.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [('migrations', '0001_initial')] - operations = [ - migrations.CreateModel( - "Example", - [ - ("id", models.AutoField(primary_key=True)), - ], - ), - ] diff --git a/tests/migrations2/test_migrations_backwards_deps_2/__init__.py b/tests/migrations2/test_migrations_backwards_deps_2/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.3