New cbs format fix cbs import atomicity

alembic/versions/205025444ebe_removing_cross_columns_from_markers.py

@@ -0,0 +1,76 @@
+"""removing cross columns from markers
+
+Revision ID: 205025444ebe
+Revises: 237ab8f171d0
+Create Date: 2026-02-12 21:29:57.945021
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "205025444ebe"
+down_revision = "237ab8f171d0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # markers
+    op.drop_column("markers", "cross_location")
+    op.drop_column("markers", "cross_direction")
+    op.drop_column("markers", "didnt_cross")
+    op.drop_column("markers", "cross_mode")
+
+    # markers_hebrew
+    op.drop_column("markers_hebrew", "cross_location")
+    op.drop_column("markers_hebrew", "cross_direction")
+    op.drop_column("markers_hebrew", "didnt_cross")
+    op.drop_column("markers_hebrew", "cross_mode")
+
+    op.drop_column("markers_hebrew", "cross_location_hebrew")
+    op.drop_column("markers_hebrew", "cross_direction_hebrew")
+    op.drop_column("markers_hebrew", "didnt_cross_hebrew")
+    op.drop_column("markers_hebrew", "cross_mode_hebrew")
+
+    # vehicles_markers_hebrew
+    op.drop_column("vehicles_markers_hebrew", "cross_location")
+    op.drop_column("vehicles_markers_hebrew", "cross_direction")
+    op.drop_column("vehicles_markers_hebrew", "didnt_cross")
+    op.drop_column("vehicles_markers_hebrew", "cross_mode")
+
+    op.drop_column("vehicles_markers_hebrew", "cross_location_hebrew")
+    op.drop_column("vehicles_markers_hebrew", "cross_direction_hebrew")
+    op.drop_column("vehicles_markers_hebrew", "didnt_cross_hebrew")
+    op.drop_column("vehicles_markers_hebrew", "cross_mode_hebrew")
+
+
+def downgrade():
+    # markers
+    op.add_column("markers", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("markers", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("markers", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("markers", sa.Column("cross_mode", sa.Integer(), nullable=True))
+
+    # markers_hebrew
+    op.add_column("markers_hebrew", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_mode", sa.Integer(), nullable=True))
+
+    op.add_column("markers_hebrew", sa.Column("cross_location_hebrew", sa.Text(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_direction_hebrew", sa.Text(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("didnt_cross_hebrew", sa.Text(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_mode_hebrew", sa.Text(), nullable=True))
+
+    # vehicles_markers_hebrew
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_mode", sa.Integer(), nullable=True))
+
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_location_hebrew", sa.Text(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_direction_hebrew", sa.Text(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("didnt_cross_hebrew", sa.Text(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_mode_hebrew", sa.Text(), nullable=True))

alembic/versions/237ab8f171d0_adding_cross_columns_to_involved.py

@@ -0,0 +1,54 @@
+"""adding cross columns to involved
+
+Revision ID: 237ab8f171d0
+Revises: ef951922e4ef
+Create Date: 2026-02-12 20:56:58.410115
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "237ab8f171d0"
+down_revision = "ef951922e4ef"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # involved (raw)
+    op.add_column("involved", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("involved", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("involved", sa.Column("cross_mode", sa.Integer(), nullable=True))
+    op.add_column("involved", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+
+    # involved_hebrew (decorated)
+    op.add_column("involved_hebrew", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("cross_direction_hebrew", sa.Text(), nullable=True))
+
+    op.add_column("involved_hebrew", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("cross_location_hebrew", sa.Text(), nullable=True))
+
+    op.add_column("involved_hebrew", sa.Column("cross_mode", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("cross_mode_hebrew", sa.Text(), nullable=True))
+
+    op.add_column("involved_hebrew", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("didnt_cross_hebrew", sa.Text(), nullable=True))
+
+
+def downgrade():
+    # involved_hebrew
+    op.drop_column("involved_hebrew", "didnt_cross_hebrew")
+    op.drop_column("involved_hebrew", "didnt_cross")
+    op.drop_column("involved_hebrew", "cross_mode_hebrew")
+    op.drop_column("involved_hebrew", "cross_mode")
+    op.drop_column("involved_hebrew", "cross_location_hebrew")
+    op.drop_column("involved_hebrew", "cross_location")
+    op.drop_column("involved_hebrew", "cross_direction_hebrew")
+    op.drop_column("involved_hebrew", "cross_direction")
+
+    # involved
+    op.drop_column("involved", "didnt_cross")
+    op.drop_column("involved", "cross_mode")
+    op.drop_column("involved", "cross_location")
+    op.drop_column("involved", "cross_direction")

alembic/versions/333a785776cd_add_new_dictionary_tables.py

@@ -0,0 +1,96 @@
+"""Add new dictionary tables
+
+Revision ID: 333a785776cd
+Revises: b7c8d9e0f1a2
+Create Date: 2026-02-02 17:47:20.438985
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '333a785776cd'
+down_revision = 'b7c8d9e0f1a2'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('entrance_exit',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('entrance_exit_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_entrance_exit_id'), 'entrance_exit', ['id'], unique=False)
+    op.create_index(op.f('ix_entrance_exit_provider_code'), 'entrance_exit', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_entrance_exit_year'), 'entrance_exit', ['year'], unique=False)
+    op.create_table('infrastructure_type',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('infrastructure_type_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_infrastructure_type_id'), 'infrastructure_type', ['id'], unique=False)
+    op.create_index(op.f('ix_infrastructure_type_provider_code'), 'infrastructure_type', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_infrastructure_type_year'), 'infrastructure_type', ['year'], unique=False)
+    op.create_table('road_alignment',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('road_alignment_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_road_alignment_id'), 'road_alignment', ['id'], unique=False)
+    op.create_index(op.f('ix_road_alignment_provider_code'), 'road_alignment', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_road_alignment_year'), 'road_alignment', ['year'], unique=False)
+    op.create_table('road_geometry',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('road_geometry_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_road_geometry_id'), 'road_geometry', ['id'], unique=False)
+    op.create_index(op.f('ix_road_geometry_provider_code'), 'road_geometry', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_road_geometry_year'), 'road_geometry', ['year'], unique=False)
+    op.create_table('vehicle_purpose',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('vehicle_purpose_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_vehicle_purpose_id'), 'vehicle_purpose', ['id'], unique=False)
+    op.create_index(op.f('ix_vehicle_purpose_provider_code'), 'vehicle_purpose', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_vehicle_purpose_year'), 'vehicle_purpose', ['year'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_vehicle_purpose_year'), table_name='vehicle_purpose')
+    op.drop_index(op.f('ix_vehicle_purpose_provider_code'), table_name='vehicle_purpose')
+    op.drop_index(op.f('ix_vehicle_purpose_id'), table_name='vehicle_purpose')
+    op.drop_table('vehicle_purpose')
+    op.drop_index(op.f('ix_road_geometry_year'), table_name='road_geometry')
+    op.drop_index(op.f('ix_road_geometry_provider_code'), table_name='road_geometry')
+    op.drop_index(op.f('ix_road_geometry_id'), table_name='road_geometry')
+    op.drop_table('road_geometry')
+    op.drop_index(op.f('ix_road_alignment_year'), table_name='road_alignment')
+    op.drop_index(op.f('ix_road_alignment_provider_code'), table_name='road_alignment')
+    op.drop_index(op.f('ix_road_alignment_id'), table_name='road_alignment')
+    op.drop_table('road_alignment')
+    op.drop_index(op.f('ix_infrastructure_type_year'), table_name='infrastructure_type')
+    op.drop_index(op.f('ix_infrastructure_type_provider_code'), table_name='infrastructure_type')
+    op.drop_index(op.f('ix_infrastructure_type_id'), table_name='infrastructure_type')
+    op.drop_table('infrastructure_type')
+    op.drop_index(op.f('ix_entrance_exit_year'), table_name='entrance_exit')
+    op.drop_index(op.f('ix_entrance_exit_provider_code'), table_name='entrance_exit')
+    op.drop_index(op.f('ix_entrance_exit_id'), table_name='entrance_exit')
+    op.drop_table('entrance_exit')
+    # ### end Alembic commands ###

alembic/versions/39966aa5db4d_adding_junction_and_junction_arm_tables.py

@@ -0,0 +1,47 @@
+"""adding junction and junction_arm tables
+
+Revision ID: 39966aa5db4d
+Revises: c5d5e94fb059
+Create Date: 2026-02-10 16:45:35.963690
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '39966aa5db4d'
+down_revision = 'c5d5e94fb059'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.create_table(
+        'junction',
+        sa.Column('junction', sa.Integer(), nullable=False),
+        sa.Column('junction_hebrew', sa.String(length=100), nullable=True),
+        sa.Column('x', sa.Float(), nullable=True),
+        sa.Column('y', sa.Float(), nullable=True),
+        sa.PrimaryKeyConstraint('junction'),
+    )
+    op.create_table(
+        'junction_arm',
+        sa.Column('arm_symbol', sa.Integer(), nullable=False),
+        sa.Column('junction_symbol', sa.Integer(), nullable=True),
+        sa.Column('is_suburban', sa.Boolean(), nullable=True),
+        sa.Column('road_symbol', sa.Integer(), nullable=True),
+        sa.Column('km', sa.Float(), nullable=True),
+        sa.Column('yishuv_symbol', sa.Integer(), nullable=True),
+        sa.Column('street_symbol', sa.Integer(), nullable=True),
+        sa.Column('arm_name', sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint('arm_symbol'),
+    )
+    op.create_index(op.f('ix_junction_arm_arm_symbol'), 'junction_arm', ['arm_symbol'], unique=False)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_junction_arm_arm_symbol'), table_name='junction_arm')
+    op.drop_table('junction_arm')
+    op.drop_table('junction')
+    # ### end Alembic commands ###

alembic/versions/42609a9cb467_removing_road_shape_columns.py

@@ -0,0 +1,84 @@
+"""removing road shape columns
+
+Revision ID: 42609a9cb467
+Revises: b460c29c20b7
+Create Date: 2026-02-12 15:09:04.110756
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "42609a9cb467"
+down_revision = "b460c29c20b7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # drop road_shape columns from tables/views
+    op.drop_column("injured_around_school_all_data", "markers_road_shape")
+
+    op.drop_column("involved_markers_hebrew", "road_shape")
+    op.drop_column("involved_markers_hebrew", "road_shape_hebrew")
+
+    op.drop_column("markers", "road_shape")
+
+    op.drop_column("markers_hebrew", "road_shape")
+    op.drop_column("markers_hebrew", "road_shape_hebrew")
+
+    op.drop_column("vehicles_markers_hebrew", "road_shape")
+    op.drop_column("vehicles_markers_hebrew", "road_shape_hebrew")
+
+    # drop the dimension table itself (only if it was removed from models)
+    op.drop_table("road_shape")
+
+
+def downgrade():
+    # recreate road_shape table (as it was in the autogen)
+    op.create_table(
+        "road_shape",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("year", sa.Integer(), nullable=False),
+        sa.Column("provider_code", sa.Integer(), nullable=False),
+        sa.Column("road_shape_hebrew", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id", "year", "provider_code", name="road_shape_pkey"),
+    )
+
+    # add columns back
+    op.add_column(
+        "vehicles_markers_hebrew",
+        sa.Column("road_shape_hebrew", sa.Text(), nullable=True),
+    )
+    op.add_column(
+        "vehicles_markers_hebrew",
+        sa.Column("road_shape", sa.Integer(), nullable=True),
+    )
+
+    op.add_column(
+        "markers_hebrew",
+        sa.Column("road_shape_hebrew", sa.Text(), nullable=True),
+    )
+    op.add_column(
+        "markers_hebrew",
+        sa.Column("road_shape", sa.Integer(), nullable=True),
+    )
+
+    op.add_column(
+        "markers",
+        sa.Column("road_shape", sa.Integer(), nullable=True),
+    )
+
+    op.add_column(
+        "involved_markers_hebrew",
+        sa.Column("road_shape_hebrew", sa.Text(), nullable=True),
+    )
+    op.add_column(
+        "involved_markers_hebrew",
+        sa.Column("road_shape", sa.Integer(), nullable=True),
+    )
+
+    op.add_column(
+        "injured_around_school_all_data",
+        sa.Column("markers_road_shape", sa.Float(), nullable=True),
+    )