merge main incl. conflict resolution

alembic/versions/c18ae67f4b2a_merge_category_feature_heads.py

@@ -0,0 +1,23 @@
+"""merge category validity and budget migration branches
+
+Revision ID: c18ae67f4b2a
+Revises: d9c6533f8a1b, fe23064de1c5
+Create Date: 2026-10-27
+
+"""
+
+from collections.abc import Sequence
+
+# revision identifiers, used by Alembic.
+revision: str = "c18ae67f4b2a"
+down_revision: str | Sequence[str] | None = ("d9c6533f8a1b", "fe23064de1c5")
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

alembic/versions/fe23064de1c5_create_category_budget_table.py

@@ -0,0 +1,52 @@
+"""create category_budget table
+
+Revision ID: fe23064de1c5
+Revises: 78ec55b9e1d1
+Create Date: 2026-10-16 10:43:24.952699
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "fe23064de1c5"
+down_revision: str | Sequence[str] | None = "78ec55b9e1d1"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "category_budget",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("category_id", sa.Integer(), nullable=False),
+        sa.Column("amount_eur", sa.Numeric(precision=12, scale=2), nullable=False),
+        sa.Column("valid_from", sa.Date(), nullable=True),
+        sa.Column("valid_to", sa.Date(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["category_id"],
+            ["category.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index(
+        "ix_category_budget_category_id",
+        "category_budget",
+        ["category_id"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_category_budget_category_id", table_name="category_budget")
+    op.drop_table("category_budget")
+    # ### end Alembic commands ###