.envrc

@@ -8,6 +8,12 @@ branch=$(git branch --show-current)
 if on_git_branch master; then
         export MM_ENV="PRODUCTION"
         export MM_DB="mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_prod"
+elif on_git_branch carts; then
+        export MM_ENV="DEVELOPMENT"
+        export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster_carts"
+elif on_git_branch newcarts; then
+        export MM_ENV="DEVELOPMENT"
+        export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster_carts"
 else
         export MM_ENV="DEVELOPMENT"
         export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster"

app/models.py

@@ -224,14 +224,11 @@ class Playlists(Base):
 
     __tablename__ = "playlists"
 
-    id = Column(Integer, primary_key=True, autoincrement=True)
-    name = Column(String(32), nullable=False, unique=True)
+    id: int = Column(Integer, primary_key=True, autoincrement=True)
+    name: str = Column(String(32), nullable=False, unique=True)
     last_used = Column(DateTime, default=None, nullable=True)
-    tab = Column(Integer, default=None, nullable=True, unique=True)
-    sort_column = Column(Integer, default=None, nullable=True, unique=False)
+    tab = Column(Integer, default=False, nullable=True, unique=True)
     is_template = Column(Boolean, default=False, nullable=False)
-    query = Column(String(256), default=None, nullable=True, unique=False)
-    deleted = Column(Boolean, default=False, nullable=False)
     rows = relationship(
         "PlaylistRows",
         back_populates="playlist",

migrations/versions/07dcbe6c4f0e_add_sort_column_deleted_and_query_to_.py

@@ -1,32 +0,0 @@
-"""Add sort_column, deleted and query to playlists table
-
-Revision ID: 07dcbe6c4f0e
-Revises: 4a7b4ab3354f
-Create Date: 2022-12-25 10:26:38.200941
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '07dcbe6c4f0e'
-down_revision = '4a7b4ab3354f'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('playlists', sa.Column('sort_column', sa.Integer(), nullable=True))
-    op.add_column('playlists', sa.Column('query', sa.String(length=256), nullable=True))
-    op.add_column('playlists', sa.Column('deleted', sa.Boolean(), nullable=False))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('playlists', 'deleted')
-    op.drop_column('playlists', 'query')
-    op.drop_column('playlists', 'sort_column')
-    # ### end Alembic commands ###