Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Database migration with alembic #112

Merged
merged 9 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,15 @@ jobs:
run: |
sleep 5
python scripts/api_e2e.py 8002

# TODO add a step to run db migration, needs DATABASE_URL through secrets ?

# db-migration:
# runs-on: ubuntu-latest
# needs: end-to-end
# steps:
# - name: Run database migration
# env:
# DATABASE_URL: ${{ secrets.DATABASE_URL }}
# run: |
# alembic upgrade head
frgfm marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ WORKDIR /usr/src/app
# set environment variables
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
ENV PYTHONPATH "${PYTHONPATH}:/app"

frgfm marked this conversation as resolved.
Show resolved Hide resolved

# copy requirements file
COPY ./requirements.txt /usr/src/app/requirements.txt
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ fastapi==0.61.1
uvicorn>=0.11.1
databases[postgresql]>=0.2.6,<=0.4.0
SQLAlchemy>=1.3.12
alembic==1.5.4
jean-pasquier marked this conversation as resolved.
Show resolved Hide resolved
python-jose>=3.2.0
passlib[bcrypt]>=1.7.4
python-multipart==0.0.5
Expand Down
84 changes: 84 additions & 0 deletions src/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# A generic, single database configuration.

# TODO adapt if needed
jean-pasquier marked this conversation as resolved.
Show resolved Hide resolved

[alembic]
# path to migration scripts
script_location = alembic

# template used to generate migration files
# file_template = %%(rev)s_%%(slug)s

# timezone to use when rendering the date
# within the migration file as well as the filename.
# 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 alembic/versions. When using multiple version
# directories, initial revisions must be specified with --version-path
# version_locations = %(here)s/bar %(here)s/bat alembic/versions

# the output encoding used when revision files
# are written from script.py.mako
# output_encoding = utf-8

[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

# 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
22 changes: 22 additions & 0 deletions src/alembic/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[comment]: <> (TODO write migration guide/contributing with docker-compose commands)
frgfm marked this conversation as resolved.
Show resolved Hide resolved

# Alembic main commands

## Manually created revision

-> `$ alembic revision -m "create account table"`<br/>
generates template "alembic/{id}_create_account_table.py"

-> implement `upgrade()` & `downgrade()` functions using SQLAlchemy operations (op.create_table, op.add_column, etc.)

-> `$ alembic upgrade head`
applies all pending revisions to database


## Auto generated revision
**Alternative** using auto generated revision (https://alembic.sqlalchemy.org/en/latest/autogenerate.html)

-> `$ alembic revision --autogenerate -m "Add account ts column"`
generates filled "alembic/{id}_add_account_ts_column.py"

-> review and adjust generated script
82 changes: 82 additions & 0 deletions src/alembic/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
from logging.config import fileConfig
frgfm marked this conversation as resolved.
Show resolved Hide resolved

from sqlalchemy import engine_from_config
from sqlalchemy import pool

from alembic import context

from app import config as cfg
from app.db import 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.
fileConfig(config.config_file_name)

# for 'autogenerate' support
target_metadata = 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 get_db_url():
return cfg.DATABASE_URL


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.

"""
context.configure(
url=get_db_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.

"""
configuration = config.get_section(config.config_ini_section)
configuration["sqlalchemy.url"] = get_db_url()
connectable = engine_from_config(
configuration,
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()
24 changes: 24 additions & 0 deletions src/alembic/script.py.mako
Original file line number Diff line number Diff line change
@@ -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"}