[v2,5/9] migrations: Mark 'RunPython' blocks as non-atomic

Message ID 20171102102844.18931-6-stephen@that.guru
State New
Headers show
Series
  • Add support for Django 1.11
Related show

Commit Message

Stephen Finucane Nov. 2, 2017, 10:28 a.m.
This appears to be required to run migrations on MySQL backend. Without
this, the following error messages are propagated:

    Executing DDL statements while in a transaction on databases that
    can't perform a rollback is prohibited.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 patchwork/migrations/0007_move_comment_content_to_patch_content.py | 6 ++++--
 patchwork/migrations/0016_series_project.py                        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/patchwork/migrations/0007_move_comment_content_to_patch_content.py b/patchwork/migrations/0007_move_comment_content_to_patch_content.py
index 43c135ea..f6ad0576 100644
--- a/patchwork/migrations/0007_move_comment_content_to_patch_content.py
+++ b/patchwork/migrations/0007_move_comment_content_to_patch_content.py
@@ -91,6 +91,8 @@  class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(copy_comment_field, uncopy_comment_field),
-        migrations.RunPython(remove_duplicate_comments, recreate_comments),
+        migrations.RunPython(copy_comment_field, uncopy_comment_field,
+                             atomic=False),
+        migrations.RunPython(remove_duplicate_comments, recreate_comments,
+                             atomic=False),
     ]
diff --git a/patchwork/migrations/0016_series_project.py b/patchwork/migrations/0016_series_project.py
index 7aea1325..f298b125 100644
--- a/patchwork/migrations/0016_series_project.py
+++ b/patchwork/migrations/0016_series_project.py
@@ -48,7 +48,7 @@  class Migration(migrations.Migration):
             name='project',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='series', to='patchwork.Project'),
         ),
-        migrations.RunPython(forward, reverse),
+        migrations.RunPython(forward, reverse, atomic=False),
         migrations.AlterField(
             model_name='seriesreference',
             name='msgid',