Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add source data #19

Merged
merged 5 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
"""add_source_data_table

Revision ID: 194b9836f0a0
Revises: 7de05df06dce
Create Date: 2024-02-15 09:55:59.456659

"""
from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op

# import geoalchemy2
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision: str = "194b9836f0a0"
down_revision: Union[str, None] = "7de05df06dce"
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.create_table(
"source_data",
sa.Column("type_of_source_data_id", sa.UUID(), nullable=False),
sa.Column(
"name",
postgresql.JSONB(astext_type=sa.Text()),
server_default='{"fin": "", "swe": "", "eng": ""}',
nullable=False,
),
sa.Column(
"language",
postgresql.JSONB(astext_type=sa.Text()),
server_default='{"fin": "", "swe": "", "eng": ""}',
nullable=False,
),
sa.Column("additional_information_uri", sa.String(), nullable=False),
sa.Column(
"id", sa.UUID(), server_default=sa.text("gen_random_uuid()"), nullable=False
),
sa.Column(
"created_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False
),
sa.Column(
"modified_at",
sa.DateTime(),
server_default=sa.text("now()"),
nullable=False,
),
sa.ForeignKeyConstraint(
["type_of_source_data_id"],
["codes.type_of_source_data.id"],
name="type_of_source_data_id_fkey",
),
sa.PrimaryKeyConstraint("id"),
schema="hame",
)
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table("source_data", schema="hame")
# ### end Alembic commands ###
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
"""remove_language_field_from_source_data_table

Revision ID: f90c256163dd
Revises: 194b9836f0a0
Create Date: 2024-02-22 11:45:58.388376

"""
from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op

# import geoalchemy2
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision: str = "f90c256163dd"
down_revision: Union[str, None] = "194b9836f0a0"
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("source_data", "language", schema="hame")
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.add_column(
"source_data",
sa.Column(
"language",
postgresql.JSONB(astext_type=sa.Text()),
server_default=sa.text('\'{"eng": "", "fin": "", "swe": ""}\'::jsonb'),
autoincrement=False,
nullable=False,
),
schema="hame",
)
# ### end Alembic commands ###
16 changes: 16 additions & 0 deletions database/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,19 @@ class PlanProposition(PlanBase):
ordering: Mapped[autoincrement_int]
# plan_theme: kaavoitusteema-koodilista
# ElinkaaritilaX_pvm


class SourceData(VersionedBase):
"""
Lähtötietoaineistot
"""

__tablename__ = "source_data"

type_of_source_data_id: Mapped[uuid.UUID] = mapped_column(
ForeignKey("codes.type_of_source_data.id", name="type_of_source_data_id_fkey")
)

type_of_source_data = relationship("TypeOfSourceData", backref="source_data")
name: Mapped[language_str]
additional_information_uri: Mapped[str]
2 changes: 1 addition & 1 deletion database/test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from db_manager import db_manager
from dotenv import load_dotenv

hame_count: int = 4 # adjust me when adding tables
hame_count: int = 5 # adjust me when adding tables
codes_count: int = 8 # adjust me when adding tables
matview_count: int = 0 # adjust me when adding views

Expand Down
Loading