From 96c4dbe3ea2681b5d53cec3f6904f5d9d221d914 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Tue, 7 Apr 2020 20:31:40 +0530 Subject: [PATCH] Keep db model and migration scripts in sync We seem to be using sqlalchemy.Text for 'status_reason' column for some tables in model and heat type LONGTEXT in migration scripts. Change-Id: I8b792936722f6fed2dd4e579aa41f6bf6aa27f7c --- heat/db/sqlalchemy/migrate_repo/versions/073_newton.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/db/sqlalchemy/migrate_repo/versions/073_newton.py b/heat/db/sqlalchemy/migrate_repo/versions/073_newton.py index 70e388bc31..3293b91cef 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/073_newton.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/073_newton.py @@ -91,7 +91,7 @@ def upgrade(migrate_engine): sqlalchemy.Column('owner_id', sqlalchemy.String(36)), sqlalchemy.Column('action', sqlalchemy.String(255)), sqlalchemy.Column('status', sqlalchemy.String(255)), - sqlalchemy.Column('status_reason', types.LongText), + sqlalchemy.Column('status_reason', sqlalchemy.Text), sqlalchemy.Column('timeout', sqlalchemy.Integer), sqlalchemy.Column('tenant', sqlalchemy.String(256)), sqlalchemy.Column('disable_rollback', sqlalchemy.Boolean, @@ -124,7 +124,7 @@ def upgrade(migrate_engine): sqlalchemy.Column('updated_at', sqlalchemy.DateTime), sqlalchemy.Column('action', sqlalchemy.String(255)), sqlalchemy.Column('status', sqlalchemy.String(255)), - sqlalchemy.Column('status_reason', types.LongText), + sqlalchemy.Column('status_reason', sqlalchemy.Text), sqlalchemy.Column('stack_id', sqlalchemy.String(36), sqlalchemy.ForeignKey('stack.id'), nullable=False), sqlalchemy.Column('rsrc_metadata', types.LongText), @@ -268,7 +268,7 @@ def upgrade(migrate_engine): sqlalchemy.Column('output_values', types.Json), sqlalchemy.Column('action', sqlalchemy.String(255)), sqlalchemy.Column('status', sqlalchemy.String(255)), - sqlalchemy.Column('status_reason', types.LongText), + sqlalchemy.Column('status_reason', sqlalchemy.Text), sqlalchemy.Column('tenant', sqlalchemy.String(64), nullable=False, index=True),