Linted and formatted everything new
This commit is contained in:
@@ -12,32 +12,31 @@ config = context.config
|
||||
# Interpret the config file for Python logging.
|
||||
# This line sets up loggers basically.
|
||||
fileConfig(config.config_file_name)
|
||||
logger = logging.getLogger('alembic.env')
|
||||
logger = logging.getLogger("alembic.env")
|
||||
|
||||
|
||||
def get_engine():
|
||||
try:
|
||||
# this works with Flask-SQLAlchemy<3 and Alchemical
|
||||
return current_app.extensions['migrate'].db.get_engine()
|
||||
except (TypeError, AttributeError):
|
||||
return current_app.extensions["migrate"].db.get_engine()
|
||||
except TypeError, AttributeError:
|
||||
# this works with Flask-SQLAlchemy>=3
|
||||
return current_app.extensions['migrate'].db.engine
|
||||
return current_app.extensions["migrate"].db.engine
|
||||
|
||||
|
||||
def get_engine_url():
|
||||
try:
|
||||
return get_engine().url.render_as_string(hide_password=False).replace(
|
||||
'%', '%%')
|
||||
return get_engine().url.render_as_string(hide_password=False).replace("%", "%%")
|
||||
except AttributeError:
|
||||
return str(get_engine().url).replace('%', '%%')
|
||||
return str(get_engine().url).replace("%", "%%")
|
||||
|
||||
|
||||
# add your model's MetaData object here
|
||||
# for 'autogenerate' support
|
||||
# from myapp import mymodel
|
||||
# target_metadata = mymodel.Base.metadata
|
||||
config.set_main_option('sqlalchemy.url', get_engine_url())
|
||||
target_db = current_app.extensions['migrate'].db
|
||||
config.set_main_option("sqlalchemy.url", get_engine_url())
|
||||
target_db = current_app.extensions["migrate"].db
|
||||
|
||||
# other values from the config, defined by the needs of env.py,
|
||||
# can be acquired:
|
||||
@@ -46,7 +45,7 @@ target_db = current_app.extensions['migrate'].db
|
||||
|
||||
|
||||
def get_metadata():
|
||||
if hasattr(target_db, 'metadatas'):
|
||||
if hasattr(target_db, "metadatas"):
|
||||
return target_db.metadatas[None]
|
||||
return target_db.metadata
|
||||
|
||||
@@ -64,9 +63,7 @@ def run_migrations_offline():
|
||||
|
||||
"""
|
||||
url = config.get_main_option("sqlalchemy.url")
|
||||
context.configure(
|
||||
url=url, target_metadata=get_metadata(), literal_binds=True
|
||||
)
|
||||
context.configure(url=url, target_metadata=get_metadata(), literal_binds=True)
|
||||
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
@@ -84,13 +81,13 @@ def run_migrations_online():
|
||||
# when there are no changes to the schema
|
||||
# reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
|
||||
def process_revision_directives(context, revision, directives):
|
||||
if getattr(config.cmd_opts, 'autogenerate', False):
|
||||
if getattr(config.cmd_opts, "autogenerate", False):
|
||||
script = directives[0]
|
||||
if script.upgrade_ops.is_empty():
|
||||
directives[:] = []
|
||||
logger.info('No changes in schema detected.')
|
||||
logger.info("No changes in schema detected.")
|
||||
|
||||
conf_args = current_app.extensions['migrate'].configure_args
|
||||
conf_args = current_app.extensions["migrate"].configure_args
|
||||
if conf_args.get("process_revision_directives") is None:
|
||||
conf_args["process_revision_directives"] = process_revision_directives
|
||||
|
||||
@@ -98,9 +95,7 @@ def run_migrations_online():
|
||||
|
||||
with connectable.connect() as connection:
|
||||
context.configure(
|
||||
connection=connection,
|
||||
target_metadata=get_metadata(),
|
||||
**conf_args
|
||||
connection=connection, target_metadata=get_metadata(), **conf_args
|
||||
)
|
||||
|
||||
with context.begin_transaction():
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
"""Initial migration
|
||||
|
||||
Revision ID: 75e81e4ab7b6
|
||||
Revises:
|
||||
Revises:
|
||||
Create Date: 2026-03-14 22:51:20.059755
|
||||
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '75e81e4ab7b6'
|
||||
revision = "75e81e4ab7b6"
|
||||
down_revision = None
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
@@ -18,90 +19,125 @@ depends_on = None
|
||||
|
||||
def upgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table('author',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('name', sa.String(length=200), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
op.create_table(
|
||||
"author",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("name", sa.String(length=200), nullable=False),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_table('genre',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('name', sa.String(length=100), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
op.create_table(
|
||||
"genre",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("name", sa.String(length=100), nullable=False),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_table('user',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('username', sa.String(), nullable=False),
|
||||
sa.Column('saved_searches', sa.JSON(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
op.create_table(
|
||||
"user",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("username", sa.String(), nullable=False),
|
||||
sa.Column("saved_searches", sa.JSON(), nullable=False),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_table('book',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('title', sa.String(length=500), nullable=False),
|
||||
sa.Column('description', sa.String(), nullable=False),
|
||||
sa.Column('first_published', sa.Integer(), nullable=True),
|
||||
sa.Column('edition', sa.String(length=200), nullable=False),
|
||||
sa.Column('publisher', sa.String(length=200), nullable=False),
|
||||
sa.Column('isbn', sa.String(length=20), nullable=False),
|
||||
sa.Column('notes', sa.String(), nullable=False),
|
||||
sa.Column('added_date', sa.DateTime(), nullable=False),
|
||||
sa.Column('bought_date', sa.Date(), nullable=True),
|
||||
sa.Column('location_place', sa.String(length=100), nullable=False),
|
||||
sa.Column('location_bookshelf', sa.String(length=100), nullable=False),
|
||||
sa.Column('location_shelf', sa.Integer(), nullable=True),
|
||||
sa.Column('loaned_to', sa.String(length=200), nullable=False),
|
||||
sa.Column('loaned_date', sa.Date(), nullable=True),
|
||||
sa.Column('owner_id', sa.Integer(), nullable=True),
|
||||
sa.ForeignKeyConstraint(['owner_id'], ['user.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
op.create_table(
|
||||
"book",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("title", sa.String(length=500), nullable=False),
|
||||
sa.Column("description", sa.String(), nullable=False),
|
||||
sa.Column("first_published", sa.Integer(), nullable=True),
|
||||
sa.Column("edition", sa.String(length=200), nullable=False),
|
||||
sa.Column("publisher", sa.String(length=200), nullable=False),
|
||||
sa.Column("isbn", sa.String(length=20), nullable=False),
|
||||
sa.Column("notes", sa.String(), nullable=False),
|
||||
sa.Column("added_date", sa.DateTime(), nullable=False),
|
||||
sa.Column("bought_date", sa.Date(), nullable=True),
|
||||
sa.Column("location_place", sa.String(length=100), nullable=False),
|
||||
sa.Column("location_bookshelf", sa.String(length=100), nullable=False),
|
||||
sa.Column("location_shelf", sa.Integer(), nullable=True),
|
||||
sa.Column("loaned_to", sa.String(length=200), nullable=False),
|
||||
sa.Column("loaned_date", sa.Date(), nullable=True),
|
||||
sa.Column("owner_id", sa.Integer(), nullable=True),
|
||||
sa.ForeignKeyConstraint(
|
||||
["owner_id"],
|
||||
["user.id"],
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_table('book_author',
|
||||
sa.Column('book_id', sa.Integer(), nullable=False),
|
||||
sa.Column('author_id', sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(['author_id'], ['author.id'], ),
|
||||
sa.ForeignKeyConstraint(['book_id'], ['book.id'], ),
|
||||
sa.PrimaryKeyConstraint('book_id', 'author_id')
|
||||
op.create_table(
|
||||
"book_author",
|
||||
sa.Column("book_id", sa.Integer(), nullable=False),
|
||||
sa.Column("author_id", sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(
|
||||
["author_id"],
|
||||
["author.id"],
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["book_id"],
|
||||
["book.id"],
|
||||
),
|
||||
sa.PrimaryKeyConstraint("book_id", "author_id"),
|
||||
)
|
||||
op.create_table('book_genre',
|
||||
sa.Column('book_id', sa.Integer(), nullable=False),
|
||||
sa.Column('genre_id', sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(['book_id'], ['book.id'], ),
|
||||
sa.ForeignKeyConstraint(['genre_id'], ['genre.id'], ),
|
||||
sa.PrimaryKeyConstraint('book_id', 'genre_id')
|
||||
op.create_table(
|
||||
"book_genre",
|
||||
sa.Column("book_id", sa.Integer(), nullable=False),
|
||||
sa.Column("genre_id", sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(
|
||||
["book_id"],
|
||||
["book.id"],
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["genre_id"],
|
||||
["genre.id"],
|
||||
),
|
||||
sa.PrimaryKeyConstraint("book_id", "genre_id"),
|
||||
)
|
||||
op.create_table('reading',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('start_date', sa.Date(), nullable=False),
|
||||
sa.Column('end_date', sa.Date(), nullable=True),
|
||||
sa.Column('finished', sa.Boolean(), nullable=False),
|
||||
sa.Column('dropped', sa.Boolean(), nullable=False),
|
||||
sa.Column('rating', sa.Integer(), nullable=True),
|
||||
sa.Column('comments', sa.String(), nullable=False),
|
||||
sa.Column('user_id', sa.Integer(), nullable=False),
|
||||
sa.Column('book_id', sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(['book_id'], ['book.id'], ),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
op.create_table(
|
||||
"reading",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("start_date", sa.Date(), nullable=False),
|
||||
sa.Column("end_date", sa.Date(), nullable=True),
|
||||
sa.Column("finished", sa.Boolean(), nullable=False),
|
||||
sa.Column("dropped", sa.Boolean(), nullable=False),
|
||||
sa.Column("rating", sa.Integer(), nullable=True),
|
||||
sa.Column("comments", sa.String(), nullable=False),
|
||||
sa.Column("user_id", sa.Integer(), nullable=False),
|
||||
sa.Column("book_id", sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(
|
||||
["book_id"],
|
||||
["book.id"],
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["user_id"],
|
||||
["user.id"],
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_table('wishlist',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('wishlisted_date', sa.Date(), nullable=False),
|
||||
sa.Column('user_id', sa.Integer(), nullable=False),
|
||||
sa.Column('book_id', sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(['book_id'], ['book.id'], ),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
op.create_table(
|
||||
"wishlist",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("wishlisted_date", sa.Date(), nullable=False),
|
||||
sa.Column("user_id", sa.Integer(), nullable=False),
|
||||
sa.Column("book_id", sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(
|
||||
["book_id"],
|
||||
["book.id"],
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["user_id"],
|
||||
["user.id"],
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_table('wishlist')
|
||||
op.drop_table('reading')
|
||||
op.drop_table('book_genre')
|
||||
op.drop_table('book_author')
|
||||
op.drop_table('book')
|
||||
op.drop_table('user')
|
||||
op.drop_table('genre')
|
||||
op.drop_table('author')
|
||||
op.drop_table("wishlist")
|
||||
op.drop_table("reading")
|
||||
op.drop_table("book_genre")
|
||||
op.drop_table("book_author")
|
||||
op.drop_table("book")
|
||||
op.drop_table("user")
|
||||
op.drop_table("genre")
|
||||
op.drop_table("author")
|
||||
# ### end Alembic commands ###
|
||||
|
||||
Reference in New Issue
Block a user