From 1252e4321e117089895c4bbc7148b73a625ee58a Mon Sep 17 00:00:00 2001 From: vadim-zabolotniy <34000376+vadim-zabolotniy@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:21:47 +0200 Subject: [PATCH] Old DB enums in migrations. (#225) --- .../2022-08-22_0823_optional_user_in_all_models.py | 1 - ...2022-10-04_1902_added_role_field_to_user_model.py | 6 ++---- .../2022-10-04_1924_set_admin_role_to_all_users.py | 1 - .../versions/2022-10-17_1639_drop_old_templates.py | 1 - ...022-10-25_0821_create_procrastination_entities.py | 4 ++++ ...6_1332_added_health_field_to_application_model.py | 7 ++----- .../versions/2022-11-15_1028_added_event_model.py | 12 ++++-------- .../2022-11-17_1243_rename_application_statuses.py | 2 -- 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/application/migrations/versions/2022-08-22_0823_optional_user_in_all_models.py b/application/migrations/versions/2022-08-22_0823_optional_user_in_all_models.py index 4e6d842d..0bb0d22c 100644 --- a/application/migrations/versions/2022-08-22_0823_optional_user_in_all_models.py +++ b/application/migrations/versions/2022-08-22_0823_optional_user_in_all_models.py @@ -5,7 +5,6 @@ Revises: bf6e28a49ebb Create Date: 2022-08-22 08:23:37.268280 """ -import sqlalchemy as sa from alembic import op from sqlalchemy.dialects import postgresql diff --git a/application/migrations/versions/2022-10-04_1902_added_role_field_to_user_model.py b/application/migrations/versions/2022-10-04_1902_added_role_field_to_user_model.py index 20db0326..974d8eed 100644 --- a/application/migrations/versions/2022-10-04_1902_added_role_field_to_user_model.py +++ b/application/migrations/versions/2022-10-04_1902_added_role_field_to_user_model.py @@ -7,8 +7,6 @@ """ import sqlalchemy as sa from alembic import op -from constants.roles import Roles -from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. @@ -19,7 +17,7 @@ def upgrade() -> None: - user_roles = postgresql.ENUM(Roles, name='user_roles') + user_roles = sa.Enum('admin', 'operator', name='user_roles') user_roles.create(op.get_bind(), checkfirst=True) op.add_column('user', sa.Column('role', user_roles, nullable=True)) @@ -27,5 +25,5 @@ def upgrade() -> None: def downgrade() -> None: op.drop_column('user', 'role') - user_roles = postgresql.ENUM(Roles, name='user_roles') + user_roles = sa.Enum('admin', 'operator', name='user_roles') user_roles.drop(op.get_bind()) diff --git a/application/migrations/versions/2022-10-04_1924_set_admin_role_to_all_users.py b/application/migrations/versions/2022-10-04_1924_set_admin_role_to_all_users.py index 7441b931..ebda2790 100644 --- a/application/migrations/versions/2022-10-04_1924_set_admin_role_to_all_users.py +++ b/application/migrations/versions/2022-10-04_1924_set_admin_role_to_all_users.py @@ -5,7 +5,6 @@ Revises: 9ee2947cff15 Create Date: 2022-10-04 19:24:52.838679 """ -import sqlalchemy as sa from alembic import op diff --git a/application/migrations/versions/2022-10-17_1639_drop_old_templates.py b/application/migrations/versions/2022-10-17_1639_drop_old_templates.py index 5f14ac71..596b449b 100644 --- a/application/migrations/versions/2022-10-17_1639_drop_old_templates.py +++ b/application/migrations/versions/2022-10-17_1639_drop_old_templates.py @@ -5,7 +5,6 @@ Revises: 69b38d90ab50 Create Date: 2022-10-17 16:39:59.985370 """ -import sqlalchemy as sa from alembic import op diff --git a/application/migrations/versions/2022-10-25_0821_create_procrastination_entities.py b/application/migrations/versions/2022-10-25_0821_create_procrastination_entities.py index b9ab3a9d..3a34e69e 100644 --- a/application/migrations/versions/2022-10-25_0821_create_procrastination_entities.py +++ b/application/migrations/versions/2022-10-25_0821_create_procrastination_entities.py @@ -24,6 +24,10 @@ def upgrade() -> None: env={**system_environment, **{'PYTHONPATH': '.'}} ) if response.returncode != 0: + error_message = response.stderr.decode() + if 'already exists' in error_message: + # It seems we trying to recreate existing Procrastinate DB entities. + return raise RuntimeError(response.stderr.decode()) diff --git a/application/migrations/versions/2022-10-26_1332_added_health_field_to_application_model.py b/application/migrations/versions/2022-10-26_1332_added_health_field_to_application_model.py index 67c70d59..d7390f56 100644 --- a/application/migrations/versions/2022-10-26_1332_added_health_field_to_application_model.py +++ b/application/migrations/versions/2022-10-26_1332_added_health_field_to_application_model.py @@ -7,9 +7,6 @@ """ import sqlalchemy as sa from alembic import op -from sqlalchemy.dialects import postgresql - -from constants.applications import ApplicationHealthStatuses # revision identifiers, used by Alembic. @@ -20,7 +17,7 @@ def upgrade() -> None: - statuses = postgresql.ENUM(ApplicationHealthStatuses, name='application_health_statuses') + statuses = sa.Enum('healthy', 'unhealthy', name='application_health_statuses') statuses.create(op.get_bind(), checkfirst=True) op.add_column('application', sa.Column('health', statuses, nullable=True)) @@ -31,5 +28,5 @@ def upgrade() -> None: def downgrade() -> None: op.drop_column('application', 'health') - statuses = postgresql.ENUM(ApplicationHealthStatuses, name='application_health_statuses') + statuses = sa.Enum('healthy', 'unhealthy', name='application_health_statuses') statuses.drop(op.get_bind()) diff --git a/application/migrations/versions/2022-11-15_1028_added_event_model.py b/application/migrations/versions/2022-11-15_1028_added_event_model.py index 479e217e..be7c7725 100644 --- a/application/migrations/versions/2022-11-15_1028_added_event_model.py +++ b/application/migrations/versions/2022-11-15_1028_added_event_model.py @@ -7,10 +7,6 @@ """ import sqlalchemy as sa from alembic import op -from sqlalchemy.dialects import postgresql - -from constants.events import EventCategory -from constants.events import EventSeverityLevel # revision identifiers, used by Alembic. @@ -21,8 +17,8 @@ def upgrade() -> None: - event_categories = postgresql.ENUM(EventCategory, name='event_categories') - event_severity_levels = postgresql.ENUM(EventSeverityLevel, name='event_severity_levels') + event_categories = sa.Enum('application', 'hook', 'organization', 'release', name='event_categories') + event_severity_levels = sa.Enum('debug', 'info', 'error', 'critical', name='event_severity_levels') op.create_table( 'event', sa.Column('id', sa.Integer(), nullable=False), @@ -40,7 +36,7 @@ def upgrade() -> None: def downgrade() -> None: op.drop_table('event') - event_categories = postgresql.ENUM(EventCategory, name='event_categories') + event_categories = sa.Enum('application', 'hook', 'organization', 'release', name='event_categories') event_categories.drop(op.get_bind()) - event_severity_levels = postgresql.ENUM(EventSeverityLevel, name='event_severity_levels') + event_severity_levels = sa.Enum('debug', 'info', 'error', 'critical', name='event_severity_levels') event_severity_levels.drop(op.get_bind()) diff --git a/application/migrations/versions/2022-11-17_1243_rename_application_statuses.py b/application/migrations/versions/2022-11-17_1243_rename_application_statuses.py index 920b7786..ea28192e 100644 --- a/application/migrations/versions/2022-11-17_1243_rename_application_statuses.py +++ b/application/migrations/versions/2022-11-17_1243_rename_application_statuses.py @@ -5,9 +5,7 @@ Revises: f6ed2d61f1fb Create Date: 2022-11-17 12:43:42.865919 """ -import sqlalchemy as sa from alembic import op -from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = 'e8700095ac3e'