Skip to content

Commit

Permalink
Remove name field from regulation (#428)
Browse files Browse the repository at this point in the history
Fix #413
  • Loading branch information
Rikuoja authored Jan 24, 2025
1 parent b67a86c commit 92f216a
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 1 deletion.
2 changes: 1 addition & 1 deletion database/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
@@ -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 ###
1 change: 1 addition & 0 deletions database/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down

0 comments on commit 92f216a

Please sign in to comment.