From c4ba926a745220242dea1dc582b539e344129be8 Mon Sep 17 00:00:00 2001 From: fullsizemalt <106900403+fullsizemalt@users.noreply.github.com> Date: Mon, 29 Dec 2025 18:34:14 -0800 Subject: [PATCH] fix: rebase migrations onto staging head --- ...0551_add_scene_and_new_vertical_fields.py} | 45 ++++--------------- ...fdca841_add_venue_canon_and_preferences.py | 2 +- 2 files changed, 9 insertions(+), 38 deletions(-) rename backend/alembic/versions/{81e183e75ff5_add_band_profile_and_musician_profile_.py => 4f14be7d0551_add_scene_and_new_vertical_fields.py} (84%) diff --git a/backend/alembic/versions/81e183e75ff5_add_band_profile_and_musician_profile_.py b/backend/alembic/versions/4f14be7d0551_add_scene_and_new_vertical_fields.py similarity index 84% rename from backend/alembic/versions/81e183e75ff5_add_band_profile_and_musician_profile_.py rename to backend/alembic/versions/4f14be7d0551_add_scene_and_new_vertical_fields.py index 98dcd48..2408da9 100644 --- a/backend/alembic/versions/81e183e75ff5_add_band_profile_and_musician_profile_.py +++ b/backend/alembic/versions/4f14be7d0551_add_scene_and_new_vertical_fields.py @@ -1,8 +1,8 @@ -"""add_band_profile_and_musician_profile_fields +"""Add Scene and new vertical fields -Revision ID: 81e183e75ff5 +Revision ID: 4f14be7d0551 Revises: 65c515b4722a -Create Date: 2025-12-28 22:53:06.940185 +Create Date: 2025-12-29 01:15:06.570017 """ from typing import Sequence, Union @@ -13,7 +13,7 @@ import sqlmodel # revision identifiers, used by Alembic. -revision: str = '81e183e75ff5' +revision: str = '4f14be7d0551' down_revision: Union[str, Sequence[str], None] = '65c515b4722a' branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None @@ -30,13 +30,6 @@ def upgrade() -> None: sa.Column('image_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True), sa.Column('primary_instrument', sqlmodel.sql.sqltypes.AutoString(), nullable=True), sa.Column('notes', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('birth_year', sa.Integer(), nullable=True), - sa.Column('origin_city', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('origin_state', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('origin_country', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('website_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('wikipedia_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('instagram_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True), sa.PrimaryKeyConstraint('id') ) with op.batch_alter_table('musician', schema=None) as batch_op: @@ -181,7 +174,7 @@ def upgrade() -> None: batch_op.add_column(sa.Column('vertical_id', sa.Integer(), nullable=True)) batch_op.add_column(sa.Column('image_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) batch_op.create_index(batch_op.f('ix_group_vertical_id'), ['vertical_id'], unique=False) - batch_op.create_foreign_key('fk_group_vertical_id_vertical', 'vertical', ['vertical_id'], ['id']) + batch_op.create_foreign_key(None, 'vertical', ['vertical_id'], ['id']) with op.batch_alter_table('performance', schema=None) as batch_op: batch_op.add_column(sa.Column('bandcamp_link', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) @@ -193,8 +186,8 @@ def upgrade() -> None: with op.batch_alter_table('song', schema=None) as batch_op: batch_op.add_column(sa.Column('canon_id', sa.Integer(), nullable=True)) batch_op.add_column(sa.Column('artist_id', sa.Integer(), nullable=True)) - batch_op.create_foreign_key('fk_song_canon_id_songcanon', 'songcanon', ['canon_id'], ['id']) - batch_op.create_foreign_key('fk_song_artist_id_artist', 'artist', ['artist_id'], ['id']) + batch_op.create_foreign_key(None, 'artist', ['artist_id'], ['id']) + batch_op.create_foreign_key(None, 'songcanon', ['canon_id'], ['id']) with op.batch_alter_table('user', schema=None) as batch_op: batch_op.add_column(sa.Column('avatar_bg_color', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) @@ -216,18 +209,7 @@ def upgrade() -> None: batch_op.add_column(sa.Column('is_featured', sa.Boolean(), nullable=False)) batch_op.add_column(sa.Column('logo_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) batch_op.add_column(sa.Column('accent_color', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('formed_year', sa.Integer(), nullable=True)) - batch_op.add_column(sa.Column('origin_city', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('origin_state', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('origin_country', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('long_description', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('website_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('wikipedia_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('bandcamp_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('nugs_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('relisten_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.add_column(sa.Column('spotify_url', sqlmodel.sql.sqltypes.AutoString(), nullable=True)) - batch_op.create_foreign_key('fk_vertical_primary_artist_id_artist', 'artist', ['primary_artist_id'], ['id']) + batch_op.create_foreign_key(None, 'artist', ['primary_artist_id'], ['id']) # ### end Alembic commands ### @@ -237,17 +219,6 @@ def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### with op.batch_alter_table('vertical', schema=None) as batch_op: batch_op.drop_constraint(None, type_='foreignkey') - batch_op.drop_column('spotify_url') - batch_op.drop_column('relisten_url') - batch_op.drop_column('nugs_url') - batch_op.drop_column('bandcamp_url') - batch_op.drop_column('wikipedia_url') - batch_op.drop_column('website_url') - batch_op.drop_column('long_description') - batch_op.drop_column('origin_country') - batch_op.drop_column('origin_state') - batch_op.drop_column('origin_city') - batch_op.drop_column('formed_year') batch_op.drop_column('accent_color') batch_op.drop_column('logo_url') batch_op.drop_column('is_featured') diff --git a/backend/alembic/versions/bc26bfdca841_add_venue_canon_and_preferences.py b/backend/alembic/versions/bc26bfdca841_add_venue_canon_and_preferences.py index cac21ec..17a2cdf 100644 --- a/backend/alembic/versions/bc26bfdca841_add_venue_canon_and_preferences.py +++ b/backend/alembic/versions/bc26bfdca841_add_venue_canon_and_preferences.py @@ -14,7 +14,7 @@ import sqlmodel # revision identifiers, used by Alembic. revision: str = 'bc26bfdca841' -down_revision: Union[str, Sequence[str], None] = '81e183e75ff5' +down_revision: Union[str, Sequence[str], None] = '4f14be7d0551' branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None