diff --git a/database/base.py b/database/base.py index 1c2ed49..8a910fd 100644 --- a/database/base.py +++ b/database/base.py @@ -121,7 +121,6 @@ class PlanBase(VersionedBase): __abstract__ = True - name: Mapped[language_str] # Let's have exported at field for all plan data, because some of them may be # exported and others added after the plan has last been exported? This will # require finding all the exported objects in the database after export is done, @@ -168,6 +167,7 @@ def __table_args__(cls): PlanBase.__table_args__, ) + name: Mapped[language_str] description: Mapped[language_str] source_data_object: Mapped[str] = mapped_column(nullable=True) height_range: Mapped[numeric_range] diff --git a/database/migrations/versions/2025_01_20_1410-4d06e8bf8c01_remove_regulation_name_field.py b/database/migrations/versions/2025_01_20_1410-4d06e8bf8c01_remove_regulation_name_field.py new file mode 100644 index 0000000..3ecb1be --- /dev/null +++ b/database/migrations/versions/2025_01_20_1410-4d06e8bf8c01_remove_regulation_name_field.py @@ -0,0 +1,53 @@ +"""remove regulation name field + +Revision ID: 4d06e8bf8c01 +Revises: 7961b5a6b56a +Create Date: 2025-01-20 14:10:18.000872 + +""" +from typing import Sequence, Union + +import geoalchemy2 +import sqlalchemy as sa +from alembic import op +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision: str = "4d06e8bf8c01" +down_revision: Union[str, None] = "265a8e71161c" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column("plan_proposition", "name", schema="hame") + op.drop_column("plan_regulation", "name", schema="hame") + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.add_column( + "plan_regulation", + sa.Column( + "name", + postgresql.JSONB(astext_type=sa.Text()), + server_default=sa.text('\'{"eng": "", "fin": "", "swe": ""}\'::jsonb'), + autoincrement=False, + nullable=False, + ), + schema="hame", + ) + op.add_column( + "plan_proposition", + sa.Column( + "name", + postgresql.JSONB(astext_type=sa.Text()), + server_default=sa.text('\'{"eng": "", "fin": "", "swe": ""}\'::jsonb'), + autoincrement=False, + nullable=False, + ), + schema="hame", + ) + # ### end Alembic commands ### diff --git a/database/models.py b/database/models.py index b027b6c..7d0a406 100644 --- a/database/models.py +++ b/database/models.py @@ -118,6 +118,7 @@ class Plan(PlanBase): permanent_plan_identifier: Mapped[Optional[str]] producers_plan_identifier: Mapped[Optional[str]] + name: Mapped[language_str] description: Mapped[language_str] scale: Mapped[Optional[int]] matter_management_identifier: Mapped[Optional[str]]