Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cleanup migrations

Roland Geidera685480ad4fe
diff --git a/wger/core/migrations/0020_create_publication_add_ivm_extension.py b/wger/core/migrations/0022_create_publication.py
similarity index 62%
rename from wger/core/migrations/0020_create_publication_add_ivm_extension.py
rename to wger/core/migrations/0022_create_publication.py
index ed0c7b7f0..66c3e7cf8 100644
--- a/wger/core/migrations/0020_create_publication_add_ivm_extension.py
+++ b/wger/core/migrations/0022_create_publication.py
@@ -1,12 +1,14 @@
# Generated by Django 4.2.13 on 2024-09-19 13:43
from django.db import migrations
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+from django.db.migrations.state import StateApps
from wger.utils.db import postgres_only
@postgres_only
-def add_publication(apps, schema_editor):
+def add_publication(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
# Note that "FOR ALL TABLES" applies for all tables created in the future as well
schema_editor.execute(
"""
@@ -23,26 +25,14 @@ def add_publication(apps, schema_editor):
@postgres_only
-def remove_publication(apps, schema_editor):
+def remove_publication(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
schema_editor.execute('DROP PUBLICATION IF EXISTS powersync;')
-
-@postgres_only
-def add_ivm_extension(apps, schema_editor):
- schema_editor.execute('CREATE EXTENSION IF NOT EXISTS pg_ivm;')
-
-
-@postgres_only
-def remove_ivm_extension(apps, schema_editor):
- schema_editor.execute('DROP EXTENSION IF EXISTS pg_ivm;')
-
-
class Migration(migrations.Migration):
dependencies = [
- ('core', '0019_delete_daysofweek'),
+ ('core', '0021_add_unit_type_to_repetitionunit'),
]
operations = [
migrations.RunPython(add_publication, reverse_code=remove_publication),
- migrations.RunPython(add_ivm_extension, reverse_code=remove_ivm_extension),
]
diff --git a/wger/nutrition/migrations/0028_add_uuids.py b/wger/nutrition/migrations/0029_add_uuids.py
similarity index 95%
rename from wger/nutrition/migrations/0028_add_uuids.py
rename to wger/nutrition/migrations/0029_add_uuids.py
index 6773540a0..6b638b6bc 100644
--- a/wger/nutrition/migrations/0028_add_uuids.py
+++ b/wger/nutrition/migrations/0029_add_uuids.py
@@ -3,8 +3,10 @@
from django.db import migrations, models
import uuid
+from django.db.migrations.state import StateApps
-def gen_uuids(apps, schema_editor):
+
+def gen_uuids(apps: StateApps, schema_editor):
NutritionPlan = apps.get_model('nutrition', 'NutritionPlan')
Meal = apps.get_model('nutrition', 'Meal')
MealItem = apps.get_model('nutrition', 'MealItem')
@@ -29,7 +31,7 @@ def gen_uuids(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ('nutrition', '0027_prefill_end_date'),
+ ('nutrition', '0028_ingredient_dietary_properties'),
]
operations = [
diff --git a/wger/nutrition/migrations/0029_create_ivm_entries.py b/wger/nutrition/migrations/0029_create_ivm_entries.py
deleted file mode 100644
index 22d8fec6e..000000000
--- a/wger/nutrition/migrations/0029_create_ivm_entries.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from django.db import migrations
-
-from wger.utils.db import postgres_only
-
-
-@postgres_only
-def add_ivm_views(apps, schema_editor):
- """
- Note: the select statements are written a bit weirdly because of this issue
- https://github.com/sraoss/pg_ivm/issues/85
-
- When this is resolved, we can remove the subqueries and write e.g.
-
- SELECT m.*, p.user_id
- FROM nutrition_meal AS m
- JOIN nutrition_nutritionplan AS p ON m.plan_id = p.id;
- """
- return
-
- schema_editor.execute(
- """
- SELECT create_immv(
- 'ivm_nutrition_nutritionplan',
- 'SELECT
- p.uuid AS id,
- p.id AS remote_id,
- creation_date,
- description,
- has_goal_calories,
- user_id,
- only_logging,
- goal_carbohydrates,
- goal_energy,
- goal_fat,
- goal_protein,
- goal_fiber
- FROM nutrition_nutritionplan AS p;'
- );
- """
- )
-
- schema_editor.execute(
- """
- SELECT create_immv(
- 'ivm_nutrition_meal',
- 'SELECT
- m.uuid AS id,
- m.id AS remote_id,
- "order",
- time,
- p.uuid AS plan_id,
- name,
- p.user_id
- FROM (SELECT * FROM nutrition_meal) AS m
- JOIN (SELECT id, uuid, user_id FROM nutrition_nutritionplan) AS p ON m.plan_id = p.id;'
- );
- """
- )
-
- schema_editor.execute(
- """
- SELECT create_immv(
- 'ivm_nutrition_mealitem',
- 'SELECT
- mi.uuid AS id,
- mi.id AS remote_id,
- "order",
- amount,
- ingredient_id,
- m.uuid AS meal_id,
- weight_unit_id,
- p.user_id
- FROM (SELECT * FROM nutrition_mealitem) AS mi
- JOIN (SELECT id, uuid, plan_id FROM nutrition_meal) AS m ON mi.meal_id = m.id
- JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON m.plan_id = p.id;'
- );
- """
- )
-
- schema_editor.execute(
- """
- SELECT create_immv(
- 'ivm_nutrition_logitem',
- 'SELECT
- li.uuid as id,
- li.id AS remote_id,
- datetime,
- comment,
- amount,
- ingredient_id,
- p.uuid AS plan_id,
- weight_unit_id,
- m.uuid AS meal_id,
- p.user_id
- FROM (SELECT * FROM nutrition_logitem) AS li
- JOIN (SELECT id, uuid FROM nutrition_meal) AS m ON li.meal_id = m.id
- JOIN (SELECT id, uuid, user_id FROM nutrition_nutritionplan) AS p ON li.plan_id = p.id;'
- );
- """
- )
-
-
-@postgres_only
-def remove_ivm_views(apps, schema_editor):
- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_nutritionplan;')
- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_meal;')
- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_mealitem;')
- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_logitem;')
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('nutrition', '0028_add_uuids'),
- ('core', '0020_create_publication_add_ivm_extension'),
- ]
-
- operations = [
- migrations.RunPython(add_ivm_views, reverse_code=remove_ivm_views),
- ]
diff --git a/wger/utils/db.py b/wger/utils/db.py
index 3e12938b9..aeba9f62e 100644
--- a/wger/utils/db.py
+++ b/wger/utils/db.py
@@ -31,6 +31,6 @@ def postgres_only(func):
if is_postgres_db():
return func(*args, **kwargs)
else:
- return
+ return None
return wrapper