mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #28386 -- Made operations within non-atomic migrations honor the operation's atomic flag when migrating backwards.

Browse Source
This commit is contained in:
Evan Grim 2017-07-11 11:40:18 -05:00 committed by Tim Graham
parent 5893eaddf4
commit 7937cc16f5
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -254,6 +254,7 @@ answer newbie questions, and generally made Django that much better:
Esdras Beleza <linux@esdrasbeleza.com> Esdras Beleza <linux@esdrasbeleza.com>
Espen Grindhaug <http://grindhaug.org/> Espen Grindhaug <http://grindhaug.org/>
Eugene Lazutkin <http://lazutkin.com/blog/> Eugene Lazutkin <http://lazutkin.com/blog/>
Evan Grim <https://github.com/egrim>
Fabrice Aneche <akh@nobugware.com> Fabrice Aneche <akh@nobugware.com>
favo@exoweb.net favo@exoweb.net
fdr <drfarina@gmail.com> fdr <drfarina@gmail.com>

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

@ -162,8 +162,10 @@ class Migration:
schema_editor.collected_sql.append("--") schema_editor.collected_sql.append("--")
if not operation.reduces_to_sql: if not operation.reduces_to_sql:
continue continue
if not schema_editor.connection.features.can_rollback_ddl and operation.atomic: atomic_operation = operation.atomic or (self.atomic and operation.atomic is not False)
# We're forcing a transaction on a non-transactional-DDL backend if not schema_editor.atomic_migration and atomic_operation:
# Force a transaction on a non-transactional-DDL backend or an
# atomic operation inside a non-atomic migration.
with atomic(schema_editor.connection.alias): with atomic(schema_editor.connection.alias):
operation.database_backwards(self.app_label, schema_editor, from_state, to_state) operation.database_backwards(self.app_label, schema_editor, from_state, to_state)
else: else:

8
tests/migrations/test_executor.py
View File

@ -126,6 +126,14 @@ class ExecutorTests(MigrationTestBase):
migrations_apps = executor.loader.project_state(("migrations", "0001_initial")).apps migrations_apps = executor.loader.project_state(("migrations", "0001_initial")).apps
Editor = migrations_apps.get_model("migrations", "Editor") Editor = migrations_apps.get_model("migrations", "Editor")
self.assertFalse(Editor.objects.exists()) self.assertFalse(Editor.objects.exists())
# Record previous migration as successful.
executor.migrate([("migrations", "0001_initial")], fake=True)
# Rebuild the graph to reflect the new DB state.
executor.loader.build_graph()
# Migrating backwards is also atomic.
with self.assertRaisesMessage(RuntimeError, "Abort migration"):
executor.migrate([("migrations", None)])
self.assertFalse(Editor.objects.exists())
@override_settings(MIGRATION_MODULES={ @override_settings(MIGRATION_MODULES={
"migrations": "migrations.test_migrations", "migrations": "migrations.test_migrations",

2
tests/migrations/test_migrations_atomic_operation/0001_initial.py
View File

@ -18,5 +18,5 @@ class Migration(migrations.Migration):
("name", models.CharField(primary_key=True, max_length=255)), ("name", models.CharField(primary_key=True, max_length=255)),
], ],
), ),
migrations.RunPython(raise_error, atomic=True), migrations.RunPython(raise_error, reverse_code=raise_error, atomic=True),
] ]

2
tests/migrations/test_operations.py
View File

@ -2055,9 +2055,11 @@ class OperationTests(OperationTestBase):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
with connection.schema_editor() as editor: with connection.schema_editor() as editor:
atomic_migration.unapply(project_state, editor) atomic_migration.unapply(project_state, editor)
self.assertEqual(project_state.apps.get_model("test_runpythonatomic", "Pony").objects.count(), 0)
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
with connection.schema_editor() as editor: with connection.schema_editor() as editor:
non_atomic_migration.unapply(project_state, editor) non_atomic_migration.unapply(project_state, editor)
self.assertEqual(project_state.apps.get_model("test_runpythonatomic", "Pony").objects.count(), 1)
# Verify deconstruction. # Verify deconstruction.
definition = non_atomic_migration.operations[0].deconstruct() definition = non_atomic_migration.operations[0].deconstruct()
self.assertEqual(definition[0], "RunPython") self.assertEqual(definition[0], "RunPython")