diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 000000000..08cf30b8f --- /dev/null +++ b/alembic.ini @@ -0,0 +1,103 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +script_location = migrations + +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. +prepend_sys_path = . + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the python-dateutil library that can be +# installed by adding `alembic[tz]` to the pip requirements +# string value is passed to dateutil.tz.gettz() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the +# "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to migrations/versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "version_path_separator" below. +# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions + +# version path separator; As mentioned above, this is the character used to split +# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. +# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. +# Valid values for version_path_separator are: +# +# version_path_separator = : +# version_path_separator = ; +# version_path_separator = space +version_path_separator = os # Use os.pathsep. Default configuration used for new projects. + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +sqlalchemy.url = sqlite:///freebies.db + + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/freebies.db b/freebies.db new file mode 100644 index 000000000..3f410b304 Binary files /dev/null and b/freebies.db differ diff --git a/lib/__pycache__/models.cpython-310.pyc b/lib/__pycache__/models.cpython-310.pyc new file mode 100644 index 000000000..a25011d6d Binary files /dev/null and b/lib/__pycache__/models.cpython-310.pyc differ diff --git a/lib/__pycache__/models.cpython-38.pyc b/lib/__pycache__/models.cpython-38.pyc new file mode 100644 index 000000000..fbafb4032 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..fe2cb37fe 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,28 @@ -#!/usr/bin/env python3 - +from models import Dev, Company, Freebie +from sqlalchemy.orm import sessionmaker from sqlalchemy import create_engine -from models import Company, Dev +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + + +print("Oldest company:", Company.oldest_company(session)) + + +c1 = session.query(Company).first() +d1 = session.query(Dev).first() +f1 = c1.give_freebie(d1, "Water Bottle", 20) +session.add(f1) +session.commit() + + +f1.print_details() + + +receiver = session.query(Dev).filter(Dev.id != d1.id).first() +d1.give_away(receiver, f1) +session.commit() + -if __name__ == '__main__': - engine = create_engine('sqlite:///freebies.db') - import ipdb; ipdb.set_trace() +f1.print_details() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..bebd373d3 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/__pycache__/env.cpython-310.pyc b/lib/migrations/__pycache__/env.cpython-310.pyc new file mode 100644 index 000000000..3326534e2 Binary files /dev/null and b/lib/migrations/__pycache__/env.cpython-310.pyc differ diff --git a/lib/migrations/env.py b/lib/migrations/env.py index c7aab9656..2244c60f2 100644 --- a/lib/migrations/env.py +++ b/lib/migrations/env.py @@ -18,9 +18,10 @@ # for 'autogenerate' support # from myapp import mymodel # target_metadata = mymodel.Base.metadata -from models import Base +from models import Base # make sure this import works target_metadata = Base.metadata + # other values from the config, defined by the needs of env.py, # can be acquired: # my_important_option = config.get_main_option("my_important_option") diff --git a/lib/migrations/versions/3df5cc1db709_create_freebie_table.py b/lib/migrations/versions/3df5cc1db709_create_freebie_table.py new file mode 100644 index 000000000..c0e4e1acb --- /dev/null +++ b/lib/migrations/versions/3df5cc1db709_create_freebie_table.py @@ -0,0 +1,37 @@ +"""Create Freebie table + +Revision ID: 3df5cc1db709 +Revises: 5f72c58bf48c +Create Date: 2025-05-25 22:19:50.971667 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3df5cc1db709' +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('item_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'], name=op.f('fk_freebies_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_freebies_dev_id_devs')), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('freebies') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/__pycache__/3df5cc1db709_create_freebie_table.cpython-310.pyc b/lib/migrations/versions/__pycache__/3df5cc1db709_create_freebie_table.cpython-310.pyc new file mode 100644 index 000000000..ee1356f36 Binary files /dev/null and b/lib/migrations/versions/__pycache__/3df5cc1db709_create_freebie_table.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc new file mode 100644 index 000000000..1a9ed15af Binary files /dev/null and b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc new file mode 100644 index 000000000..39a25d7fb Binary files /dev/null and b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc differ diff --git a/lib/models.py b/lib/models.py index 2681bee5a..eb439df6e 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,4 +1,4 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy import Column, Integer, String, ForeignKey, MetaData from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base @@ -6,7 +6,6 @@ "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } metadata = MetaData(naming_convention=convention) - Base = declarative_base(metadata=metadata) class Company(Base): @@ -16,14 +15,57 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', backref='company') + + @property + def devs(self): + return list({freebie.dev for freebie in self.freebies}) + + def give_freebie(self, dev, item_name, value): + from models import Freebie # Avoid circular import if using in seed/debug + return Freebie(item_name=item_name, value=value, dev=dev, company=self) + + @classmethod + def oldest_company(cls, session): + return session.query(cls).order_by(cls.founding_year).first() + def __repr__(self): - return f'' + return f"" class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) + + freebies = relationship('Freebie', backref='dev') + + @property + def companies(self): + return list({freebie.company for freebie in self.freebies}) + + def received_one(self, item_name): + return any(freebie.item_name == item_name for freebie in self.freebies) + + def give_away(self, dev, freebie): + if freebie in self.freebies: + freebie.dev = dev + + def __repr__(self): + return f"" + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key=True) + item_name = Column(String()) + value = Column(Integer()) + + dev_id = Column(Integer(), ForeignKey('devs.id')) + company_id = Column(Integer(), ForeignKey('companies.id')) + + def print_details(self): + print(f"{self.dev.name} owns a {self.item_name} from {self.company.name}") def __repr__(self): - return f'' + return f"" diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..24420ffcc 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,39 @@ -#!/usr/bin/env python3 +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -# Script goes here! +from models import Base, Company, Dev, Freebie + +# Create the engine and bind it to the database +engine = create_engine('sqlite:///freebies.db') +Base.metadata.bind = engine + +# Create a session +Session = sessionmaker(bind=engine) +session = Session() + +# Clear old data (optional: helpful for reseeding) +session.query(Freebie).delete() +session.query(Dev).delete() +session.query(Company).delete() + +# Create some companies +company1 = Company(name="Google", founding_year=1998) +company2 = Company(name="Amazon", founding_year=1994) +company3 = Company(name="OpenAI", founding_year=2015) + +# Create some developers +dev1 = Dev(name="Alice") +dev2 = Dev(name="Bob") +dev3 = Dev(name="Charlie") + +# Create some freebies +freebie1 = Freebie(item_name="T-shirt", value=20, company=company1, dev=dev1) +freebie2 = Freebie(item_name="Sticker", value=5, company=company2, dev=dev2) +freebie3 = Freebie(item_name="Mug", value=15, company=company3, dev=dev1) +freebie4 = Freebie(item_name="Notebook", value=10, company=company1, dev=dev3) + +# Add and commit everything +session.add_all([company1, company2, company3, dev1, dev2, dev3, freebie1, freebie2, freebie3, freebie4]) +session.commit() + +print("✅ Database seeded successfully!") diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/__pycache__/env.cpython-310.pyc b/migrations/__pycache__/env.cpython-310.pyc new file mode 100644 index 000000000..6fc09b7c7 Binary files /dev/null and b/migrations/__pycache__/env.cpython-310.pyc differ diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..70518a2ee --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,77 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = None + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/3391b0431425_create_freebies_table.py b/migrations/versions/3391b0431425_create_freebies_table.py new file mode 100644 index 000000000..b6875ec88 --- /dev/null +++ b/migrations/versions/3391b0431425_create_freebies_table.py @@ -0,0 +1,31 @@ +"""Create freebies table + +Revision ID: 3391b0431425 +Revises: +Create Date: 2025-05-25 11:06:30.233752 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3391b0431425' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade() -> None: + op.create_table( + 'freebies', + sa.Column('id', sa.Integer(), primary_key=True), + sa.Column('item_name', sa.String()), + sa.Column('value', sa.Integer()), + sa.Column('dev_id', sa.Integer(), sa.ForeignKey('devs.id')), + sa.Column('company_id', sa.Integer(), sa.ForeignKey('companies.id')), + ) + +def downgrade() -> None: + op.drop_table('freebies') + diff --git a/migrations/versions/__pycache__/3391b0431425_create_freebies_table.cpython-310.pyc b/migrations/versions/__pycache__/3391b0431425_create_freebies_table.cpython-310.pyc new file mode 100644 index 000000000..670dae7d1 Binary files /dev/null and b/migrations/versions/__pycache__/3391b0431425_create_freebies_table.cpython-310.pyc differ