diff --git a/lib/__pycache__/models.cpython-38.pyc b/lib/__pycache__/models.cpython-38.pyc new file mode 100644 index 000000000..b2977a03b Binary files /dev/null and b/lib/__pycache__/models.cpython-38.pyc differ diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..be8155e5a 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,13 @@ #!/usr/bin/env python3 from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -from models import Company, Dev +from models import Company, Dev, Freebie # Import all models if __name__ == '__main__': - engine = create_engine('sqlite:///freebies.db') - import ipdb; ipdb.set_trace() + engine = create_engine('sqlite:///freebies.db') # Create engine + Session = sessionmaker(bind=engine) + session = Session() # Create session + + import ipdb; ipdb.set_trace() # Start interactive debugging diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..8c2ecef29 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/95122781f9f6_create_freebies_table.py b/lib/migrations/versions/95122781f9f6_create_freebies_table.py new file mode 100644 index 000000000..7c5916f3a --- /dev/null +++ b/lib/migrations/versions/95122781f9f6_create_freebies_table.py @@ -0,0 +1,30 @@ +"""Create freebies table + +Revision ID: 95122781f9f6 +Revises: 5f72c58bf48c +Create Date: 2025-03-04 08:02:07.008788 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '95122781f9f6' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + 'freebies', + sa.Column('id', sa.Integer, primary_key=True), + sa.Column('item_name', sa.String, nullable=False), + sa.Column('value', sa.Integer, nullable=False), + sa.Column('dev_id', sa.Integer, sa.ForeignKey('devs.id')), + sa.Column('company_id', sa.Integer, sa.ForeignKey('companies.id')) + ) + +def downgrade(): + op.drop_table('freebies') diff --git a/lib/models.py b/lib/models.py index 2681bee5a..39af93a0f 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,7 +1,8 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy.orm import relationship from sqlalchemy.ext.declarative import declarative_base +# Define naming conventions for foreign keys convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } @@ -12,9 +13,15 @@ class Company(Base): __tablename__ = 'companies' - id = Column(Integer(), primary_key=True) - name = Column(String()) - founding_year = Column(Integer()) + id = Column(Integer, primary_key=True) + name = Column(String, nullable=False) + founding_year = Column(Integer, nullable=False) + + # Define relationship to Freebie + freebies = relationship("Freebie", back_populates="company") + + # Define relationship to Dev through Freebie (Add overlaps to avoid conflict) + devs = relationship("Dev", secondary="freebies", back_populates="companies", overlaps="freebies") def __repr__(self): return f'' @@ -22,8 +29,30 @@ def __repr__(self): class Dev(Base): __tablename__ = 'devs' - id = Column(Integer(), primary_key=True) - name= Column(String()) - + id = Column(Integer, primary_key=True) + name = Column(String, nullable=False) + + # Define relationship to Freebie + freebies = relationship("Freebie", back_populates="dev") + + # Define relationship to Company through Freebie (Add overlaps to avoid conflict) + companies = relationship("Company", secondary="freebies", back_populates="devs", overlaps="freebies") + def __repr__(self): return f'' + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer, primary_key=True) + item_name = Column(String, nullable=False) + value = Column(Integer, nullable=False) + dev_id = Column(Integer, ForeignKey('devs.id')) + company_id = Column(Integer, ForeignKey('companies.id')) + + # Define relationships with overlaps to avoid conflicts + dev = relationship("Dev", back_populates="freebies", overlaps="companies,devs") + company = relationship("Company", back_populates="freebies", overlaps="companies,devs") + + def __repr__(self): + return f'' diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..80d9ad983 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,28 @@ -#!/usr/bin/env python3 +from sqlalchemy.orm import sessionmaker +from sqlalchemy import create_engine +from models import Dev, Company, Freebie, Base # Ensure you import Base for table creation -# Script goes here! +# Create an engine (modify the database URL as needed) +engine = create_engine('sqlite:///freebies.db') # Or use another DB type + +# Create session factory and initialize a session instance +Session = sessionmaker(bind=engine) +session = Session() # This is the actual session object + +# Ensure the database tables are created +Base.metadata.create_all(engine) + +# Seed data +dev1 = Dev(name="Alice") +dev2 = Dev(name="Bob") +company1 = Company(name="Google", founding_year=1998) +company2 = Company(name="Microsoft", founding_year=1975) + +freebie1 = Freebie(item_name="T-Shirt", value=10, dev=dev1, company=company1) +freebie2 = Freebie(item_name="Mug", value=5, dev=dev2, company=company2) + +# Add records to the session and commit +session.add_all([dev1, dev2, company1, company2, freebie1, freebie2]) +session.commit() + +print("Database seeded successfully!")