From ff8540c684d69a11902ed6ccfd8cfdc4d0746240 Mon Sep 17 00:00:00 2001 From: mrtedn21 Date: Wed, 15 Nov 2023 12:15:14 +0700 Subject: [PATCH] remove alembic, it must be in app --- MANIFEST.in | 1 - alembic.ini | 116 ------------------------------ alembic/env.py | 78 -------------------- alembic/script.py.mako | 26 ------- alembic/versions/ac84c65dce92_.py | 58 --------------- alembic/versions/b2715552a7ea_.py | 55 -------------- alembic/versions/ea0b8bdaec50_.py | 64 ----------------- 7 files changed, 398 deletions(-) delete mode 100644 alembic.ini delete mode 100644 alembic/env.py delete mode 100644 alembic/script.py.mako delete mode 100644 alembic/versions/ac84c65dce92_.py delete mode 100644 alembic/versions/b2715552a7ea_.py delete mode 100644 alembic/versions/ea0b8bdaec50_.py diff --git a/MANIFEST.in b/MANIFEST.in index a06fc48..5b644bf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,2 @@ include example.json include swg.html -include alembic.ini diff --git a/alembic.ini b/alembic.ini deleted file mode 100644 index 052f690..0000000 --- a/alembic.ini +++ /dev/null @@ -1,116 +0,0 @@ -# A generic, single database configuration. - -[alembic] -# path to migration scripts -script_location = alembic - -# 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 alembic/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:alembic/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. - -# 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 = postgresql+psycopg2://alexander.bezgin:123@localhost/framework - - -[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 = 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/alembic/env.py b/alembic/env.py deleted file mode 100644 index badc29e..0000000 --- a/alembic/env.py +++ /dev/null @@ -1,78 +0,0 @@ -from logging.config import fileConfig - -from database import Base -from sqlalchemy import engine_from_config, 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 -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 - ) - - with context.begin_transaction(): - context.run_migrations() - - -if context.is_offline_mode(): - run_migrations_offline() -else: - run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako deleted file mode 100644 index fbc4b07..0000000 --- a/alembic/script.py.mako +++ /dev/null @@ -1,26 +0,0 @@ -"""${message} - -Revision ID: ${up_revision} -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: 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: - ${upgrades if upgrades else "pass"} - - -def downgrade() -> None: - ${downgrades if downgrades else "pass"} diff --git a/alembic/versions/ac84c65dce92_.py b/alembic/versions/ac84c65dce92_.py deleted file mode 100644 index c4e814b..0000000 --- a/alembic/versions/ac84c65dce92_.py +++ /dev/null @@ -1,58 +0,0 @@ -"""empty message - -Revision ID: ac84c65dce92 -Revises: b2715552a7ea -Create Date: 2023-09-20 01:41:43.295109 - -""" -from typing import Sequence, Union - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = 'ac84c65dce92' -down_revision: Union[str, None] = 'b2715552a7ea' -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( - 'genders', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=False), - sa.PrimaryKeyConstraint('pk') - ) - op.create_table( - 'languages', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=False), - sa.PrimaryKeyConstraint('pk') - ) - op.add_column( - 'users', sa.Column('language_id', sa.Integer(), nullable=True), - ) - op.add_column('users', sa.Column('gender_id', sa.Integer(), nullable=True)) - op.alter_column( - 'users', 'city_id', existing_type=sa.INTEGER(), nullable=True, - ) - op.create_foreign_key(None, 'users', 'genders', ['gender_id'], ['pk']) - op.create_foreign_key(None, 'users', 'languages', ['language_id'], ['pk']) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'users', type_='foreignkey') - op.drop_constraint(None, 'users', type_='foreignkey') - op.alter_column( - 'users', 'city_id', existing_type=sa.INTEGER(), nullable=False, - ) - op.drop_column('users', 'gender_id') - op.drop_column('users', 'language_id') - op.drop_table('languages') - op.drop_table('genders') - # ### end Alembic commands ### diff --git a/alembic/versions/b2715552a7ea_.py b/alembic/versions/b2715552a7ea_.py deleted file mode 100644 index 85b926d..0000000 --- a/alembic/versions/b2715552a7ea_.py +++ /dev/null @@ -1,55 +0,0 @@ -"""empty message - -Revision ID: b2715552a7ea -Revises: -Create Date: 2023-09-14 13:28:59.451951 - -""" -from typing import Sequence, Union - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = 'b2715552a7ea' -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( - 'countries', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=False), - sa.PrimaryKeyConstraint('pk') - ) - op.create_table( - 'cities', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=False), - sa.Column('country_id', sa.Integer(), nullable=False), - sa.ForeignKeyConstraint(['country_id'], ['countries.pk'], ), - sa.PrimaryKeyConstraint('pk') - ) - op.create_table( - 'users', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('first_name', sa.String(), nullable=False), - sa.Column('last_name', sa.String(), nullable=False), - sa.Column('birth_date', sa.Date(), nullable=False), - sa.Column('city_id', sa.Integer(), nullable=False), - sa.ForeignKeyConstraint(['city_id'], ['cities.pk'], ), - sa.PrimaryKeyConstraint('pk') - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('users') - op.drop_table('cities') - op.drop_table('countries') - # ### end Alembic commands ### diff --git a/alembic/versions/ea0b8bdaec50_.py b/alembic/versions/ea0b8bdaec50_.py deleted file mode 100644 index 49a60ff..0000000 --- a/alembic/versions/ea0b8bdaec50_.py +++ /dev/null @@ -1,64 +0,0 @@ -"""empty message - -Revision ID: ea0b8bdaec50 -Revises: ac84c65dce92 -Create Date: 2023-10-03 17:18:41.634856 - -""" -from typing import Sequence, Union - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = 'ea0b8bdaec50' -down_revision: Union[str, None] = 'ac84c65dce92' -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( - 'chats', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('name', sa.String(), nullable=True), - sa.Column( - 'chat_type', - sa.Enum('DIRECT', 'GROUP', 'SELF', name='chattype'), - nullable=False, - ), - sa.Column('last_message_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['last_message_id'], ['users.pk'], ), - sa.PrimaryKeyConstraint('pk') - ) - op.create_table( - 'chats_to_users', - sa.Column('chat_id', sa.Integer(), nullable=True), - sa.Column('user_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['chat_id'], ['chats.pk'], ), - sa.ForeignKeyConstraint(['user_id'], ['users.pk'], ) - ) - op.create_table( - 'messages', - sa.Column('pk', sa.Integer(), nullable=False), - sa.Column('text', sa.String(), nullable=False), - sa.Column('date_time', sa.DateTime(), nullable=False), - sa.Column('created_by_id', sa.Integer(), nullable=False), - sa.Column('chat_id', sa.Integer(), nullable=False), - sa.Column('reply_to_message_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['chat_id'], ['chats.pk'], ), - sa.ForeignKeyConstraint(['created_by_id'], ['users.pk'], ), - sa.ForeignKeyConstraint(['reply_to_message_id'], ['messages.pk'], ), - sa.PrimaryKeyConstraint('pk') - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('messages') - op.drop_table('chats_to_users') - op.drop_table('chats') - # ### end Alembic commands ###