diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..c40588eb1 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/fe020d1c46ee_added_freebie.py b/lib/migrations/versions/fe020d1c46ee_added_freebie.py new file mode 100644 index 000000000..f57262ae0 --- /dev/null +++ b/lib/migrations/versions/fe020d1c46ee_added_freebie.py @@ -0,0 +1,45 @@ +"""added freebie + +Revision ID: fe020d1c46ee +Revises: 5f72c58bf48c +Create Date: 2023-06-07 03:42:30.390496 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fe020d1c46ee' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('freebies', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('value', sa.Integer(), nullable=True), + sa.Column('dev_id', sa.Integer(), nullable=True), + sa.Column('company_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], ), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('game_users', + sa.Column('company_id', sa.Integer(), nullable=False), + sa.Column('dev_id', sa.Integer(), nullable=False), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], ), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], ), + sa.PrimaryKeyConstraint('company_id', 'dev_id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('game_users') + op.drop_table('freebies') + # ### end Alembic commands ### diff --git a/lib/models.py b/lib/models.py index 2681bee5a..326d0b3a7 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,14 +1,17 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy import ForeignKey, Column, Integer, String,Table from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base -convention = { - "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", -} -metadata = MetaData(naming_convention=convention) - -Base = declarative_base(metadata=metadata) +Base = declarative_base() +dev_user= Table( + 'game_users', + Base.metadata, + Column('company_id',ForeignKey('companies.id'),primary_key=True), + Column('dev_id',ForeignKey('devs.id'),primary_key=True), + extend_existing=True +) + class Company(Base): __tablename__ = 'companies' @@ -16,6 +19,9 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + dev_user=relationship('Dev',secondary=dev_user,back_populates='companies') + freebie=relationship('Freebie',backref=backref('companies')) + def __repr__(self): return f'' @@ -25,5 +31,21 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + dev_user=relationship('Company',secondary=dev_user,back_populates='devs') + freebie=relationship('Freebie',backref=backref('devs')) + def __repr__(self): return f'' + +class Freebie(Base): + __tablename__='freebies' + id=Column(Integer(),primary_key=True) + name = Column(String()) + value = Column(Integer()) + + dev_id = Column(Integer(), ForeignKey('devs.id')) + company_id = Column(Integer(), ForeignKey('companies.id')) + + def __repr__(self): + return f'User(id={self.id}, ' + \ + f'name={self.name})' \ No newline at end of file