From d7a918f2b1a25998e5bd92f329ef0427c54810ea Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 13 Jul 2023 12:36:27 +0100 Subject: [PATCH] db: Sync alembic, sqlalchemy-migrate migrations Alembic's auto-generate functionality doesn't preserve index names or column order. This causes comparisons between databases to fail. Update the initial alembic migration to match the schema's generated by sqlalchemy-migrate. Change-Id: I16763a82cc2db9138882ace2dad6f0cae330b9e8 Signed-off-by: Stephen Finucane --- .../8bdf5929c5a6_add_vm_moves_table.py | 6 ++---- .../versions/8f848eb45d03_initial_revision.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/masakari/db/sqlalchemy/migrations/versions/8bdf5929c5a6_add_vm_moves_table.py b/masakari/db/sqlalchemy/migrations/versions/8bdf5929c5a6_add_vm_moves_table.py index 1763c475..37de9f3f 100644 --- a/masakari/db/sqlalchemy/migrations/versions/8bdf5929c5a6_add_vm_moves_table.py +++ b/masakari/db/sqlalchemy/migrations/versions/8bdf5929c5a6_add_vm_moves_table.py @@ -29,17 +29,16 @@ depends_on = None def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### op.create_table( 'vmoves', + sa.Column('created_at', sa.DateTime(), nullable=True), + sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('deleted_at', sa.DateTime(), nullable=True), sa.Column( 'deleted', oslo_db_types.SoftDeleteInteger(), nullable=True, ), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('uuid', sa.String(length=36), nullable=False), sa.Column('notification_uuid', sa.String(length=36), nullable=False), @@ -55,4 +54,3 @@ def upgrade() -> None: sa.PrimaryKeyConstraint('id'), sa.UniqueConstraint('uuid', name='uniq_vmove0uuid'), ) - # ### end Alembic commands ### diff --git a/masakari/db/sqlalchemy/migrations/versions/8f848eb45d03_initial_revision.py b/masakari/db/sqlalchemy/migrations/versions/8f848eb45d03_initial_revision.py index ae7e0c91..152b0e21 100644 --- a/masakari/db/sqlalchemy/migrations/versions/8f848eb45d03_initial_revision.py +++ b/masakari/db/sqlalchemy/migrations/versions/8f848eb45d03_initial_revision.py @@ -31,19 +31,18 @@ depends_on = None def upgrade() -> None: op.create_table( 'failover_segments', + sa.Column('created_at', sa.DateTime(), nullable=True), + sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('deleted_at', sa.DateTime(), nullable=True), sa.Column( 'deleted', oslo_db_types.SoftDeleteInteger(), nullable=True, ), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('uuid', sa.String(length=36), nullable=False), sa.Column('name', sa.String(length=255), nullable=False), sa.Column('service_type', sa.String(length=255), nullable=False), - sa.Column('enabled', sa.Boolean(), nullable=True), sa.Column('description', sa.Text(), nullable=True), sa.Column( 'recovery_method', @@ -56,6 +55,7 @@ def upgrade() -> None: ), nullable=False, ), + sa.Column('enabled', sa.Boolean(), nullable=True), sa.PrimaryKeyConstraint('id'), sa.UniqueConstraint( 'name', 'deleted', name='uniq_segment0name0deleted' @@ -70,17 +70,18 @@ def upgrade() -> None: ) op.create_table( 'notifications', + sa.Column('created_at', sa.DateTime(), nullable=True), + sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('deleted_at', sa.DateTime(), nullable=True), sa.Column( 'deleted', oslo_db_types.SoftDeleteInteger(), nullable=True, ), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('notification_uuid', sa.String(length=36), nullable=False), sa.Column('generated_time', sa.DateTime(), nullable=False), + sa.Column('source_host_uuid', sa.String(length=36), nullable=False), sa.Column('type', sa.String(length=36), nullable=False), sa.Column('payload', sa.Text(), nullable=True), sa.Column( @@ -96,7 +97,6 @@ def upgrade() -> None: ), nullable=False, ), - sa.Column('source_host_uuid', sa.String(length=36), nullable=False), sa.PrimaryKeyConstraint('id'), sa.UniqueConstraint( 'notification_uuid', name='uniq_notification0uuid' @@ -104,22 +104,22 @@ def upgrade() -> None: ) op.create_table( 'hosts', + sa.Column('created_at', sa.DateTime(), nullable=True), + sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('deleted_at', sa.DateTime(), nullable=True), sa.Column( 'deleted', oslo_db_types.SoftDeleteInteger(), nullable=True, ), - sa.Column('created_at', sa.DateTime(), nullable=True), - sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), sa.Column('uuid', sa.String(length=36), nullable=False), sa.Column('name', sa.String(length=255), nullable=False), sa.Column('reserved', sa.Boolean(), nullable=True), sa.Column('type', sa.String(length=255), nullable=False), sa.Column('control_attributes', sa.Text(), nullable=False), - sa.Column('on_maintenance', sa.Boolean(), nullable=True), sa.Column('failover_segment_id', sa.String(length=36), nullable=False), + sa.Column('on_maintenance', sa.Boolean(), nullable=True), sa.ForeignKeyConstraint( ['failover_segment_id'], ['failover_segments.uuid'],