From 0feaafbee971d19308fd7c3a1080104f6d343d77 Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Wed, 28 Jun 2017 13:44:37 -0400 Subject: [PATCH] Revert "Increase the Environment variable column length" This reverts commit 98a6433b9abe9f52055f91225a4d03b6ed73758a. Before this can be cherry-picked, earlier migrations must also be included, otherwise, it will break on upgrade. Change-Id: I94c5aaac143fd4876349a40ec4d2315c36376e3e --- .../versions/020_increase_env_columns_size.py | 35 ------------------- mistral/db/v2/sqlalchemy/models.py | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 mistral/db/sqlalchemy/migration/alembic_migrations/versions/020_increase_env_columns_size.py diff --git a/mistral/db/sqlalchemy/migration/alembic_migrations/versions/020_increase_env_columns_size.py b/mistral/db/sqlalchemy/migration/alembic_migrations/versions/020_increase_env_columns_size.py deleted file mode 100644 index 545198ce8..000000000 --- a/mistral/db/sqlalchemy/migration/alembic_migrations/versions/020_increase_env_columns_size.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2015 OpenStack Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Increase environments_v2 column size from JsonDictType to JsonLongDictType - -Revision ID: 020 -Revises: 019 -Create Date: 2017-06-13 13:29:41.636094 - -""" - -# revision identifiers, used by Alembic. -revision = '020' -down_revision = '019' - -from alembic import op -from mistral.db.sqlalchemy import types as st - - -def upgrade(): - # Changing column types from JsonDictType to JsonLongDictType - op.alter_column('environments_v2', 'variables', - type_=st.JsonLongDictType()) diff --git a/mistral/db/v2/sqlalchemy/models.py b/mistral/db/v2/sqlalchemy/models.py index 87cd8266f..2b6d0c622 100644 --- a/mistral/db/v2/sqlalchemy/models.py +++ b/mistral/db/v2/sqlalchemy/models.py @@ -366,7 +366,7 @@ class Environment(mb.MistralSecureModelBase): id = mb.id_column() name = sa.Column(sa.String(200)) description = sa.Column(sa.Text()) - variables = sa.Column(st.JsonLongDictType()) + variables = sa.Column(st.JsonDictType()) class CronTrigger(mb.MistralSecureModelBase):