Self hosted FLOSS fitness/workout, nutrition and weight tracker
Split migrations so that each can run in its own transaction
Roland Geiderebf67c903d9d
diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.pyindex 977762920..ad698de33 100644--- a/wger/core/tests/api_base_test.py+++ b/wger/core/tests/api_base_test.py@@ -194,14 +194,16 @@ class ApiGetTestCase:self.client.get(self.url)resource_queries = [- q for q in context.captured_queries+ q+ for q in context.captured_queriesif 'django_session' not in q['sql']and 'SAVEPOINT' not in q['sql']and 'RELEASE' not in q['sql']]self.assertEqual(- len(resource_queries), 0,- f'Expected no resource queries on cached request, got: {resource_queries}'+ len(resource_queries),+ 0,+ f'Expected no resource queries on cached request, got: {resource_queries}',)def test_special_endpoints(self):diff --git a/wger/exercises/migrations/0037_replace_variation_with_uuid_field.py b/wger/exercises/migrations/0037_replace_variation_with_uuid_field.pyindex f3f741f0c..0954d8ce7 100644--- a/wger/exercises/migrations/0037_replace_variation_with_uuid_field.py+++ b/wger/exercises/migrations/0037_replace_variation_with_uuid_field.py@@ -46,14 +46,12 @@ def fix_sqlite_historical_indexes(apps: StateApps, schema_editor: BaseDatabaseScelif schema_editor.connection.vendor == 'mysql':cursor.execute(- "SELECT INDEX_NAME FROM INFORMATION_SCHEMA.STATISTICS "+ 'SELECT INDEX_NAME FROM INFORMATION_SCHEMA.STATISTICS '"WHERE TABLE_NAME = 'exercises_historicaltranslation' ""AND INDEX_NAME LIKE 'exercises_historicalexercise_%%'")for (index_name,) in cursor.fetchall():- cursor.execute(- f'DROP INDEX `{index_name}` ON `exercises_historicaltranslation`'- )+ cursor.execute(f'DROP INDEX `{index_name}` ON `exercises_historicaltranslation`')def generate_variation_uuids(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):@@ -79,7 +77,6 @@ class Migration(migrations.Migration):operations = [migrations.RunPython(fix_sqlite_historical_indexes, migrations.RunPython.noop),-# Temporarily add UUID to the variation tablemigrations.AddField(model_name='variation',@@ -106,7 +103,6 @@ class Migration(migrations.Migration):verbose_name='Variation group',),),-# Copy data and remove FK relationsmigrations.RunPython(copy_variation_uuids, migrations.RunPython.noop),migrations.RemoveField(@@ -117,7 +113,6 @@ class Migration(migrations.Migration):model_name='historicalexercise',name='variations',),-# Cleanupmigrations.DeleteModel(name='Variation',diff --git a/wger/nutrition/migrations/0031_merge_weight_unit_into_ingredient_weight_unit.py b/wger/nutrition/migrations/0031_start_weight_unit_merge.pysimilarity index 79%rename from wger/nutrition/migrations/0031_merge_weight_unit_into_ingredient_weight_unit.pyrename to wger/nutrition/migrations/0031_start_weight_unit_merge.pyindex cfb14ef9c..6b2566851 100644--- a/wger/nutrition/migrations/0031_merge_weight_unit_into_ingredient_weight_unit.py+++ b/wger/nutrition/migrations/0031_start_weight_unit_merge.py@@ -1,6 +1,11 @@from django.db import migrations, models-from wger.utils.uuid import uuid7++"""+Merges weight units into one table.++This migration is split into three files so that each one runs in its own transaction+"""def migrate_weight_units(apps, schema_editor):@@ -48,20 +53,4 @@ class Migration(migrations.Migration):),# Copy names and delete unreferenced entriesmigrations.RunPython(migrate_weight_units, migrations.RunPython.noop),- migrations.AddField(- model_name='ingredientweightunit',- name='uuid',- field=models.UUIDField(default=uuid7, editable=False, unique=True),- ),- migrations.RemoveField(- model_name='ingredientweightunit',- name='unit',- ),- migrations.RemoveField(- model_name='ingredientweightunit',- name='amount',- ),- migrations.DeleteModel(- name='WeightUnit',- ),]diff --git a/wger/nutrition/migrations/0032_continue_weight_unit_merge.py b/wger/nutrition/migrations/0032_continue_weight_unit_merge.pynew file mode 100644index 000000000..e154dafcd--- /dev/null+++ b/wger/nutrition/migrations/0032_continue_weight_unit_merge.py@@ -0,0 +1,27 @@+from django.db import migrations, models++from wger.utils.uuid import uuid7+++def populate_uuids(apps, schema_editor):+ IngredientWeightUnit = apps.get_model('nutrition', 'IngredientWeightUnit')+ for iwu in IngredientWeightUnit.objects.all():+ iwu.uuid = uuid7()+ iwu.save(update_fields=['uuid'])+++class Migration(migrations.Migration):+ dependencies = [+ ('nutrition', '0031_start_weight_unit_merge'),+ ]++ operations = [+ # Add uuid field without unique constraint first+ migrations.AddField(+ model_name='ingredientweightunit',+ name='uuid',+ field=models.UUIDField(default=uuid7, editable=False, null=True),+ ),+ # Populate each row with a unique UUID+ migrations.RunPython(populate_uuids, migrations.RunPython.noop),+ ]diff --git a/wger/nutrition/migrations/0033_finalize_weight_unit_merge.py b/wger/nutrition/migrations/0033_finalize_weight_unit_merge.pynew file mode 100644index 000000000..d5254e2d1--- /dev/null+++ b/wger/nutrition/migrations/0033_finalize_weight_unit_merge.py@@ -0,0 +1,29 @@+from django.db import migrations, models++from wger.utils.uuid import uuid7+++class Migration(migrations.Migration):+ dependencies = [+ ('nutrition', '0032_continue_weight_unit_merge'),+ ]++ operations = [+ # Now make uuid non-nullable and unique+ migrations.AlterField(+ model_name='ingredientweightunit',+ name='uuid',+ field=models.UUIDField(default=uuid7, editable=False, unique=True),+ ),+ migrations.RemoveField(+ model_name='ingredientweightunit',+ name='unit',+ ),+ migrations.RemoveField(+ model_name='ingredientweightunit',+ name='amount',+ ),+ migrations.DeleteModel(+ name='WeightUnit',+ ),+ ]