diff --git a/mealie/db/models/recipe/ingredient.py b/mealie/db/models/recipe/ingredient.py index b00f4c60a..fd40f0201 100644 --- a/mealie/db/models/recipe/ingredient.py +++ b/mealie/db/models/recipe/ingredient.py @@ -1,13 +1,14 @@ -import sqlalchemy as sa from mealie.db.models.model_base import SqlAlchemyBase +from sqlalchemy import Column, ForeignKey, Integer, String class RecipeIngredient(SqlAlchemyBase): __tablename__ = "recipes_ingredients" - id = sa.Column(sa.Integer, primary_key=True) - position = sa.Column(sa.Integer) - parent_id = sa.Column(sa.Integer, sa.ForeignKey("recipes.id")) - ingredient = sa.Column(sa.String) + id = Column(Integer, primary_key=True) + position = Column(Integer) + parent_id = Column(Integer, ForeignKey("recipes.id")) + # title = Column(String) + ingredient = Column(String) def update(self, ingredient): self.ingredient = ingredient diff --git a/mealie/db/models/recipe/instruction.py b/mealie/db/models/recipe/instruction.py index 080ebcbdb..59fb88d67 100644 --- a/mealie/db/models/recipe/instruction.py +++ b/mealie/db/models/recipe/instruction.py @@ -1,12 +1,12 @@ -import sqlalchemy as sa from mealie.db.models.model_base import SqlAlchemyBase +from sqlalchemy import Column, ForeignKey, Integer, String class RecipeInstruction(SqlAlchemyBase): __tablename__ = "recipe_instructions" - id = sa.Column(sa.Integer, primary_key=True) - parent_id = sa.Column(sa.Integer, sa.ForeignKey("recipes.id")) - position = sa.Column(sa.Integer) - type = sa.Column(sa.String, default="") - text = sa.Column(sa.String) - title = sa.Column(sa.String) + id = Column(Integer, primary_key=True) + parent_id = Column(Integer, ForeignKey("recipes.id")) + position = Column(Integer) + type = Column(String, default="") + title = Column(String) + text = Column(String)