From 5ec8a97b6f668473699f6939e577acac9ae91d28 Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Tue, 27 May 2025 19:05:05 +0300 Subject: [PATCH 01/13] first commit --- alembic.ini | 105 ++++++++++++++++++++++++++++++++++++++ lib/models.py | 3 ++ migrations/README | 1 + migrations/env.py | 81 +++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++++ 5 files changed, 214 insertions(+) create mode 100644 alembic.ini create mode 100644 migrations/README create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 000000000..ebf940abd --- /dev/null +++ b/alembic.ini @@ -0,0 +1,105 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +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-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 = driver://user:pass@localhost/dbname + + +[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/lib/models.py b/lib/models.py index 2681bee5a..d41544e73 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,12 +1,15 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base +from datetime import datetime +# Define the naming convention for foreign keys convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } metadata = MetaData(naming_convention=convention) +# Create a base class for declarative models with the defined metadata Base = declarative_base(metadata=metadata) class Company(Base): 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/env.py b/migrations/env.py new file mode 100644 index 000000000..30bf3761a --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,81 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context +from models import Base +target_metadata = Base.metadata + + +# 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 +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() -> 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 + ) + + 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..55df2863d --- /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() -> None: + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + ${downgrades if downgrades else "pass"} From c28b7fe099fc2b81fea02f4642c16a9ba724330b Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Tue, 27 May 2025 19:13:28 +0300 Subject: [PATCH 02/13] Establish a relationship with Freebie --- lib/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/models.py b/lib/models.py index d41544e73..01f885071 100644 --- a/lib/models.py +++ b/lib/models.py @@ -16,8 +16,11 @@ class Company(Base): __tablename__ = 'companies' id = Column(Integer(), primary_key=True) - name = Column(String()) - founding_year = Column(Integer()) + name = Column(String(), nullable=False) + founding_year = Column(Integer(), nullable=False) + + # Establish a relationship with Freebie + freebies = relationship('Freebie', backref='company', lazy='dynamic') def __repr__(self): return f'' From 7c0318308e30821abbb508a94c8f3ef188b90bd4 Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 08:36:02 +0300 Subject: [PATCH 03/13] dev to freebie relationship --- lib/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/models.py b/lib/models.py index 01f885071..d23741b26 100644 --- a/lib/models.py +++ b/lib/models.py @@ -23,13 +23,16 @@ class Company(Base): freebies = relationship('Freebie', backref='company', lazy='dynamic') def __repr__(self): - return f'' + return f'' class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name= Column(String(), nullable=False) + + # Establish a relationship with Freebie + freebies = relationship('Freebie', backref='dev', lazy='dynamic') def __repr__(self): return f'' From 12f21755f0c8f1d91ab1a45641c2aa3334ccfe87 Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 14:09:05 +0300 Subject: [PATCH 04/13] class Freebie --- lib/models.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/models.py b/lib/models.py index d23741b26..983cd372e 100644 --- a/lib/models.py +++ b/lib/models.py @@ -36,3 +36,18 @@ class Dev(Base): def __repr__(self): return f'' + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key=True) + name = Column(String(), nullable=False) + description = Column(String(), nullable=False) + date_given = Column(String(), default=datetime.utcnow().strftime('%Y-%m-%d')) + + # Foreign keys + company_id = Column(Integer(), ForeignKey('companies.id'), nullable=False) + dev_id = Column(Integer(), ForeignKey('devs.id'), nullable=False) + + def __repr__(self): + return f'' From 050fe7957ec22971342d9d4122ee8f242beddfdc Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 14:16:50 +0300 Subject: [PATCH 05/13] freebie relationship --- lib/models.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/models.py b/lib/models.py index 983cd372e..bb655a240 100644 --- a/lib/models.py +++ b/lib/models.py @@ -41,13 +41,17 @@ class Freebie(Base): __tablename__ = 'freebies' id = Column(Integer(), primary_key=True) - name = Column(String(), nullable=False) + item_name = Column(String(), nullable=False) description = Column(String(), nullable=False) date_given = Column(String(), default=datetime.utcnow().strftime('%Y-%m-%d')) # Foreign keys company_id = Column(Integer(), ForeignKey('companies.id'), nullable=False) dev_id = Column(Integer(), ForeignKey('devs.id'), nullable=False) - + + #Relationships + company = relationship('Company', back_populates='freebies') + dev = relationship('Dev', back_populates='freebies') + def __repr__(self): - return f'' + return f'Item: {self.item_name}', f'Description: {self.description}', f'Date Given: {self.date_given}>' From 8736419237df9a1ccca1fc7b9d45858de501702a Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 14:54:41 +0300 Subject: [PATCH 06/13] database engine and session --- lib/migrations/__init__.py | 8 ++++++++ lib/models.py | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 lib/migrations/__init__.py diff --git a/lib/migrations/__init__.py b/lib/migrations/__init__.py new file mode 100644 index 000000000..a31406ac4 --- /dev/null +++ b/lib/migrations/__init__.py @@ -0,0 +1,8 @@ +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +DATABASE_URL = "sqlite:///freebie.db" + +engine = create_engine(DATABASE_URL, echo=True) +Session = sessionmaker(bind=engine) +session = Session() diff --git a/lib/models.py b/lib/models.py index bb655a240..1995e708f 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,6 +1,5 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, DateTime +from sqlalchemy.orm import relationship, declarative_base from datetime import datetime # Define the naming convention for foreign keys @@ -20,7 +19,7 @@ class Company(Base): founding_year = Column(Integer(), nullable=False) # Establish a relationship with Freebie - freebies = relationship('Freebie', backref='company', lazy='dynamic') + freebies = relationship('Freebie', back_populates='company') def __repr__(self): return f'' @@ -32,7 +31,7 @@ class Dev(Base): name= Column(String(), nullable=False) # Establish a relationship with Freebie - freebies = relationship('Freebie', backref='dev', lazy='dynamic') + freebies = relationship('Freebie', back_populates='dev') def __repr__(self): return f'' From 7c445553faaf46e505e945797103eaca93cf424c Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 15:22:32 +0300 Subject: [PATCH 07/13] new Freebie associated with this company and the given dev --- lib/models.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/models.py b/lib/models.py index 1995e708f..f954f841a 100644 --- a/lib/models.py +++ b/lib/models.py @@ -19,10 +19,15 @@ class Company(Base): founding_year = Column(Integer(), nullable=False) # Establish a relationship with Freebie - freebies = relationship('Freebie', back_populates='company') + freebies = relationship('Freebie', back_populates='company', cascade='all, delete-orphan') def __repr__(self): return f'' + + def give_freebie(self,dev, item_name, value): + """Creates a new Freebie associated with this company and the given dev.""" + return Freebie(item_name=item_name, value=value, dev=dev, company=self) + class Dev(Base): __tablename__ = 'devs' @@ -41,7 +46,7 @@ class Freebie(Base): id = Column(Integer(), primary_key=True) item_name = Column(String(), nullable=False) - description = Column(String(), nullable=False) + value = Column(String(), nullable=False) date_given = Column(String(), default=datetime.utcnow().strftime('%Y-%m-%d')) # Foreign keys @@ -53,4 +58,4 @@ class Freebie(Base): dev = relationship('Dev', back_populates='freebies') def __repr__(self): - return f'Item: {self.item_name}', f'Description: {self.description}', f'Date Given: {self.date_given}>' + return f'Item: {self.item_name}', f'Description: {self.value}', f'Date Given: {self.date_given}>' From 49611996876c22fe4e731d8d43f0add246bcdb2e Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 15:35:49 +0300 Subject: [PATCH 08/13] returns the oldest company --- lib/models.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/models.py b/lib/models.py index f954f841a..dfdd7f0e5 100644 --- a/lib/models.py +++ b/lib/models.py @@ -27,6 +27,11 @@ def __repr__(self): def give_freebie(self,dev, item_name, value): """Creates a new Freebie associated with this company and the given dev.""" return Freebie(item_name=item_name, value=value, dev=dev, company=self) + + @classmethod + def oldest_company(cls, session): + """Returns the oldest company in the database.""" + return session.query(cls).order_by(cls.founding_year).first() class Dev(Base): From 17ef56486dbb968b477f55aaa81919495be2f66b Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 16:01:26 +0300 Subject: [PATCH 09/13] received freebie --- lib/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/models.py b/lib/models.py index dfdd7f0e5..6ef0ea151 100644 --- a/lib/models.py +++ b/lib/models.py @@ -46,6 +46,10 @@ class Dev(Base): def __repr__(self): return f'' + def received_one(self, item_name): + """Checks if the dev has received a freebie with the given item name.""" + return any(freebie.item_name == item_name for freebie in self.freebies) + class Freebie(Base): __tablename__ = 'freebies' From 56f7a6f3d7de848d278f9e5477a4c516e95628f1 Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 16:52:02 +0300 Subject: [PATCH 10/13] transfer freebie to another dev --- lib/models.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/models.py b/lib/models.py index 6ef0ea151..edb5bcdbd 100644 --- a/lib/models.py +++ b/lib/models.py @@ -50,6 +50,13 @@ def received_one(self, item_name): """Checks if the dev has received a freebie with the given item name.""" return any(freebie.item_name == item_name for freebie in self.freebies) + def give_away(self, other_dev, freebie): + """ + Transfers a freebie to another dev if the freebie belongs to this dev. + """ + if freebie in self.freebies: + freebie.dev = other_dev + class Freebie(Base): __tablename__ = 'freebies' From 145e558fd91391f5c2fd11333eb174a73e24af6a Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 17:07:44 +0300 Subject: [PATCH 11/13] seed.py. added --- lib/models.py | 12 ++++++++++-- lib/seed.py | 29 ++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/lib/models.py b/lib/models.py index edb5bcdbd..794aadc25 100644 --- a/lib/models.py +++ b/lib/models.py @@ -56,6 +56,11 @@ def give_away(self, other_dev, freebie): """ if freebie in self.freebies: freebie.dev = other_dev + + @property + def companies(self): + """Returns a set of companies from which the dev has received freebies.""" + return {freebie.company for freebie in self.freebies} class Freebie(Base): __tablename__ = 'freebies' @@ -63,7 +68,6 @@ class Freebie(Base): id = Column(Integer(), primary_key=True) item_name = Column(String(), nullable=False) value = Column(String(), nullable=False) - date_given = Column(String(), default=datetime.utcnow().strftime('%Y-%m-%d')) # Foreign keys company_id = Column(Integer(), ForeignKey('companies.id'), nullable=False) @@ -74,4 +78,8 @@ class Freebie(Base): dev = relationship('Dev', back_populates='freebies') def __repr__(self): - return f'Item: {self.item_name}', f'Description: {self.value}', f'Date Given: {self.date_given}>' + return f'Item: {self.item_name}', f'Description: {self.value}>' + + def print_details(self): + """Returns a string detailing the freebie's ownership.""" + 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..3e3217f86 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,30 @@ #!/usr/bin/env python3 -# Script goes here! +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie + +# Create an engine and session +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +# Create tables +Base.metadata.create_all(engine) + +# Create sample companies +company1 = Company(name='TechCorp', founding_year=2000) +company2 = Company(name='InnovateX', founding_year=1995) + +# Create sample devs +dev1 = Dev(name='Alice') +dev2 = Dev(name='Bob') + +# Create sample freebies +freebie1 = Freebie(item_name='T-Shirt', value=20, company=company1, dev=dev1) +freebie2 = Freebie(item_name='Mug', value=10, company=company2, dev=dev2) + +# Add to session and commit +session.add_all([company1, company2, dev1, dev2, freebie1, freebie2]) +session.commit() + From e3b6649bc1dd522eca42437ce1c51f129f320e2f Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 17:12:26 +0300 Subject: [PATCH 12/13] debug.py set --- lib/debug.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..a4d17a488 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,17 @@ #!/usr/bin/env python3 from sqlalchemy import create_engine - -from models import Company, Dev +from models import Base, Company, Dev, Freebie +from sqlalchemy.orm import sessionmaker +# Create an engine and session +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() + # Fetch all devs + devs = session.query(Dev).all() + for dev in devs: + print(dev) + print(f"Companies: {[company.name for company in dev.companies]}") + print(f"Received 'T-Shirt': {dev.received_one('T-Shirt')}") \ No newline at end of file From 9b88e9ad9d564e758c837d9a49a3f7de49bff06d Mon Sep 17 00:00:00 2001 From: Boniface Kimani Muguro Date: Wed, 28 May 2025 17:55:56 +0300 Subject: [PATCH 13/13] final commit --- alembic.ini | 4 +- lib/alembic.ini | 2 +- lib/debug.py | 2 +- lib/freebies.db | Bin 20480 -> 24576 bytes lib/freebies.db' | Bin 0 -> 24576 bytes lib/migrations/__init__.py | 2 +- lib/migrations/env.py | 2 +- lib/seed.py | 2 +- migrations/env.py | 4 +- .../c07888c9c3c8_initial_migration.py | 50 ++++++++++++++++++ 10 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 lib/freebies.db' create mode 100644 migrations/versions/c07888c9c3c8_initial_migration.py diff --git a/alembic.ini b/alembic.ini index ebf940abd..3c6affadb 100644 --- a/alembic.ini +++ b/alembic.ini @@ -55,9 +55,7 @@ version_path_separator = os # Use os.pathsep. Default configuration used for ne # are written from script.py.mako # output_encoding = utf-8 -sqlalchemy.url = driver://user:pass@localhost/dbname - - +sqlalchemy.url = sqlite:///lib/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 diff --git a/lib/alembic.ini b/lib/alembic.ini index 953863ddd..a76567e6c 100644 --- a/lib/alembic.ini +++ b/lib/alembic.ini @@ -55,7 +55,7 @@ version_path_separator = os # Use os.pathsep. Default configuration used for ne # are written from script.py.mako # output_encoding = utf-8 -sqlalchemy.url = sqlite:///freebies.db +sqlalchemy.url = sqlite:///lib/freebies.db [post_write_hooks] diff --git a/lib/debug.py b/lib/debug.py index a4d17a488..37e29e448 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -4,7 +4,7 @@ from models import Base, Company, Dev, Freebie from sqlalchemy.orm import sessionmaker # Create an engine and session -engine = create_engine('sqlite:///freebies.db') +engine = create_engine('sqlite:///lib/freebies.db') Session = sessionmaker(bind=engine) session = Session() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c963e832db481e7a7493e3029e691ac4dc..d662ffbf62d4a05b23fec1fad843c1834570a306 100644 GIT binary patch delta 564 zcmZozz}Rqrae}lUI|Bm)8xX?)%S0Vxadrm1a4%l|9}KKK(-`=9`FHZw^GWec+t{eU zW75pX$}TP|%h(!Pl9-f}npTvWnv|JZ45QhcgIpa$TopnboqSvsprVr<`DE%dOHy;= z^AdAY6~Y{YoIMTcAv!pA_8ugIqn` z{Xhn2AQWgS1i8Ao2D$nWae}lUD+2=q2*UvLL>*&MRtCLzSzi7h3@m(74E((OJNfGQq&5o*EaTlQ Y#rH~)i9rC!xz9gwf;1a1NF$sJ0HVYZR{#J2 diff --git a/lib/freebies.db' b/lib/freebies.db' new file mode 100644 index 0000000000000000000000000000000000000000..2dc41f880a5d18b99a9d1b1241873a14a7c1ab64 GIT binary patch literal 24576 zcmeI&O>f#T7zc2h*MUaarQ(F@OC=(vX&Z+!O_iD&0$3I(eG9d!Q31dA|*xSzLf%JN=EoO2wc87lKYa$YBtTBjqd7JR3 zUU(uawdY#o%&wi5*a+hK%4U%e*Tz#jcbv$S&a0HTz9YYkKM&OD7uIw#oPQVb!Jfq` zlIl_OAb8vqRHnsWM17DT009U<00Izz00bZa0SG_<0ua~{fjycyw4WZ;>vj8uU9;@5tt284!Q~1Rwwb2tWV=5P$##AOL}-KrwlkTYvu#e*ag0`bUBQ1Rwwb2tWV= z5P$##AOHafKwyUj@czHUn~SAE00Izz00bZa0SG_<0uX=z1eOAL|Hn~)00bZa0SG_< Q0uX=z1Rwwb2<*PVUx}6_^#A|> literal 0 HcmV?d00001 diff --git a/lib/migrations/__init__.py b/lib/migrations/__init__.py index a31406ac4..7265f37d7 100644 --- a/lib/migrations/__init__.py +++ b/lib/migrations/__init__.py @@ -1,7 +1,7 @@ from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker -DATABASE_URL = "sqlite:///freebie.db" +DATABASE_URL = "sqlite:///lib/freebies.db" engine = create_engine(DATABASE_URL, echo=True) Session = sessionmaker(bind=engine) diff --git a/lib/migrations/env.py b/lib/migrations/env.py index c7aab9656..673edb45d 100644 --- a/lib/migrations/env.py +++ b/lib/migrations/env.py @@ -4,6 +4,7 @@ from sqlalchemy import pool from alembic import context +from models import Base # this is the Alembic Config object, which provides # access to the values within the .ini file in use. @@ -18,7 +19,6 @@ # 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, diff --git a/lib/seed.py b/lib/seed.py index 3e3217f86..079ddd55e 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -5,7 +5,7 @@ from models import Base, Company, Dev, Freebie # Create an engine and session -engine = create_engine('sqlite:///freebies.db') +engine = create_engine('sqlite:///lib/freebies.db') Session = sessionmaker(bind=engine) session = Session() diff --git a/migrations/env.py b/migrations/env.py index 30bf3761a..192f46488 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -5,8 +5,6 @@ from alembic import context from models import Base -target_metadata = Base.metadata - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. @@ -21,7 +19,7 @@ # for 'autogenerate' support # from myapp import mymodel # target_metadata = mymodel.Base.metadata -target_metadata = None +target_metadata = Base.metadata # other values from the config, defined by the needs of env.py, # can be acquired: diff --git a/migrations/versions/c07888c9c3c8_initial_migration.py b/migrations/versions/c07888c9c3c8_initial_migration.py new file mode 100644 index 000000000..0fb9f94c5 --- /dev/null +++ b/migrations/versions/c07888c9c3c8_initial_migration.py @@ -0,0 +1,50 @@ +"""Initial migration + +Revision ID: c07888c9c3c8 +Revises: +Create Date: 2025-05-28 17:28:39.144158 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c07888c9c3c8' +down_revision = None +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=False), + sa.Column('founding_year', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('devs', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('freebies', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('item_name', sa.String(), nullable=False), + sa.Column('value', sa.String(), nullable=False), + sa.Column('company_id', sa.Integer(), nullable=False), + sa.Column('dev_id', sa.Integer(), nullable=False), + 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 ###