diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 000000000..7a19d4b61 --- /dev/null +++ b/alembic.ini @@ -0,0 +1,120 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +# Use forward slashes (/) also on windows to provide an os agnostic path +script_location = migrations + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(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>=3.9 or backports.zoneinfo library and tzdata library. +# Any required deps can installed by adding `alembic[tz]` to the pip requirements +# string value is passed to ZoneInfo() +# 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 = newline +# +# Use os.pathsep. Default configuration used for new projects. +version_path_separator = os + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# 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 + +# lint with attempts to fix using "ruff" - use the exec runner, execute a binary +# hooks = ruff +# ruff.type = exec +# ruff.executable = %(here)s/.venv/bin/ruff +# ruff.options = --fix REVISION_SCRIPT_FILENAME + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +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..037f42198 Binary files /dev/null and b/freebies.db differ diff --git a/lib/__pycache__/models.cpython-38.pyc b/lib/__pycache__/models.cpython-38.pyc new file mode 100644 index 000000000..93baeed6b 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..7ca4c416a 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, Freebie -from models import Company, Dev +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() if __name__ == '__main__': - engine = create_engine('sqlite:///freebies.db') import ipdb; ipdb.set_trace() + diff --git a/lib/migrations/env.py b/lib/migrations/env.py deleted file mode 100644 index c7aab9656..000000000 --- a/lib/migrations/env.py +++ /dev/null @@ -1,79 +0,0 @@ -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. -if config.config_file_name is not None: - fileConfig(config.config_file_name) - -# add your model's MetaData object here -# for 'autogenerate' support -# from myapp import mymodel -# target_metadata = mymodel.Base.metadata -from models import Base -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") -# ... etc. - - -def run_migrations_offline() -> None: - """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() -> None: - """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, render_as_batch=True, - ) - - with context.begin_transaction(): - context.run_migrations() - - -if context.is_offline_mode(): - run_migrations_offline() -else: - run_migrations_online() diff --git a/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py b/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py deleted file mode 100644 index c191bb2f9..000000000 --- a/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py +++ /dev/null @@ -1,39 +0,0 @@ -"""create companies, devs - -Revision ID: 5f72c58bf48c -Revises: 7a71dbf71c64 -Create Date: 2023-03-15 15:06:20.944586 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '5f72c58bf48c' -down_revision = '7a71dbf71c64' -branch_labels = None -depends_on = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('companies', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=True), - sa.Column('founding_year', sa.Integer(), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('devs', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('devs') - op.drop_table('companies') - # ### end Alembic commands ### diff --git a/lib/migrations/versions/7a71dbf71c64_create_db.py b/lib/migrations/versions/7a71dbf71c64_create_db.py deleted file mode 100644 index 23e0a655b..000000000 --- a/lib/migrations/versions/7a71dbf71c64_create_db.py +++ /dev/null @@ -1,24 +0,0 @@ -"""create db - -Revision ID: 7a71dbf71c64 -Revises: -Create Date: 2023-03-15 15:05:55.516631 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '7a71dbf71c64' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade() -> None: - pass - - -def downgrade() -> None: - pass diff --git a/lib/models.py b/lib/models.py index 2681bee5a..a3d672654 100644 --- a/lib/models.py +++ b/lib/models.py @@ -27,3 +27,20 @@ class Dev(Base): 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")) + + dev = relationship("Dev", "freebies") + company = relationship("Company", "freebies") + + def __repr__(self): + return f"{self.dev.name} owns a {self.item_name} from {self.company.name}" diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..68c29234f 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,24 @@ #!/usr/bin/env python3 +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie -# Script goes here! +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +Base.metadata.create_all(engine) + +company1 = Company(name="Google", founding_year=1998) +company2 = Company(name="Microsoft", founding_year=1975) + +dev1 = Dev(name="Alice") +dev2 = Dev(name="Bob") + +freebie1 = Freebie(item_name="Sticker", value=1, dev=dev1, company=company1) +freebie2 = Freebie(item_name="T-shirt", value=10, dev=dev2, company=company2) + +session.add_all([company1, company2, dev1, dev2, freebie1, freebie2]) +session.commit() + +print("Database seeded successfully!") diff --git a/lib/migrations/README b/migrations/README similarity index 100% rename from lib/migrations/README rename to migrations/README diff --git a/migrations/__pycache__/env.cpython-38.pyc b/migrations/__pycache__/env.cpython-38.pyc new file mode 100644 index 000000000..b1d80976f Binary files /dev/null and b/migrations/__pycache__/env.cpython-38.pyc differ diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..3e3aa8310 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,50 @@ +from logging.config import fileConfig +from sqlalchemy import engine_from_config, pool +from alembic import context + +# Import your Base from the models +from lib.models import Base + +# this is the Alembic Config object +config = context.config + +# Set up loggers +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# Set target metadata for autogeneration +target_metadata = Base.metadata + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode.""" + 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() -> None: + """Run migrations in 'online' mode.""" + 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/lib/migrations/script.py.mako b/migrations/script.py.mako similarity index 57% rename from lib/migrations/script.py.mako rename to migrations/script.py.mako index 55df2863d..fbc4b07dc 100644 --- a/lib/migrations/script.py.mako +++ b/migrations/script.py.mako @@ -5,15 +5,17 @@ Revises: ${down_revision | comma,n} Create Date: ${create_date} """ +from typing import Sequence, Union + 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)} +revision: str = ${repr(up_revision)} +down_revision: Union[str, None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} def upgrade() -> None: diff --git a/migrations/versions/0882b862ce57_create_freebies_table.py b/migrations/versions/0882b862ce57_create_freebies_table.py new file mode 100644 index 000000000..94b3e384f --- /dev/null +++ b/migrations/versions/0882b862ce57_create_freebies_table.py @@ -0,0 +1,30 @@ +"""Create freebies table + +Revision ID: 0882b862ce57 +Revises: 7b9977055ada +Create Date: 2025-05-26 02:31:14.446169 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '0882b862ce57' +down_revision: Union[str, None] = '7b9977055ada' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/migrations/versions/196608911bd9_create_freebies_table.py b/migrations/versions/196608911bd9_create_freebies_table.py new file mode 100644 index 000000000..180875381 --- /dev/null +++ b/migrations/versions/196608911bd9_create_freebies_table.py @@ -0,0 +1,52 @@ +"""Create freebies table + +Revision ID: 196608911bd9 +Revises: +Create Date: 2025-05-26 02:27:22.251580 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '196608911bd9' +down_revision: Union[str, None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('companies', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('founding_year', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('devs', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + 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') + op.drop_table('devs') + op.drop_table('companies') + # ### end Alembic commands ### diff --git a/migrations/versions/7b9977055ada_create_freebies_table.py b/migrations/versions/7b9977055ada_create_freebies_table.py new file mode 100644 index 000000000..e38676acc --- /dev/null +++ b/migrations/versions/7b9977055ada_create_freebies_table.py @@ -0,0 +1,30 @@ +"""Create freebies table + +Revision ID: 7b9977055ada +Revises: 196608911bd9 +Create Date: 2025-05-26 02:30:14.081458 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '7b9977055ada' +down_revision: Union[str, None] = '196608911bd9' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/migrations/versions/__pycache__/0882b862ce57_create_freebies_table.cpython-38.pyc b/migrations/versions/__pycache__/0882b862ce57_create_freebies_table.cpython-38.pyc new file mode 100644 index 000000000..07e4143da Binary files /dev/null and b/migrations/versions/__pycache__/0882b862ce57_create_freebies_table.cpython-38.pyc differ diff --git a/migrations/versions/__pycache__/196608911bd9_create_freebies_table.cpython-38.pyc b/migrations/versions/__pycache__/196608911bd9_create_freebies_table.cpython-38.pyc new file mode 100644 index 000000000..b6ca6f8bd Binary files /dev/null and b/migrations/versions/__pycache__/196608911bd9_create_freebies_table.cpython-38.pyc differ diff --git a/migrations/versions/__pycache__/7b9977055ada_create_freebies_table.cpython-38.pyc b/migrations/versions/__pycache__/7b9977055ada_create_freebies_table.cpython-38.pyc new file mode 100644 index 000000000..f2398d2fe Binary files /dev/null and b/migrations/versions/__pycache__/7b9977055ada_create_freebies_table.cpython-38.pyc differ diff --git a/migrations/versions/__pycache__/fec15770b0fe_create_freebies_table.cpython-38.pyc b/migrations/versions/__pycache__/fec15770b0fe_create_freebies_table.cpython-38.pyc new file mode 100644 index 000000000..2f8b638ab Binary files /dev/null and b/migrations/versions/__pycache__/fec15770b0fe_create_freebies_table.cpython-38.pyc differ diff --git a/migrations/versions/fec15770b0fe_create_freebies_table.py b/migrations/versions/fec15770b0fe_create_freebies_table.py new file mode 100644 index 000000000..9ba450870 --- /dev/null +++ b/migrations/versions/fec15770b0fe_create_freebies_table.py @@ -0,0 +1,35 @@ +"""create freebies table + +Revision ID: fec15770b0fe +Revises: 0882b862ce57 +Create Date: 2025-05-26 02:32:46.933064 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'fec15770b0fe' +down_revision: Union[str, None] = '0882b862ce57' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +from alembic import op +import sqlalchemy as sa + +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")