From 5514fcdfa4acee60443469d45412187ac147b5c3 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Sat, 4 Oct 2014 13:46:58 -0700 Subject: [PATCH] Use the new table length constants Instead of having constants for lengths that aren't shared among the table master schema and the upgrade scripts move the constants that exist in the schema upgrade scripts (which are used to arrive at the master schema) to use the same constants the master table schema module uses. Change-Id: I312760ee329ebd3161c09b316d55afe129ff2d09 --- .../1cea328f0f65_initial_logbook_deta.py | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py b/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py index 6f529cef..c428beb5 100644 --- a/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py +++ b/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py @@ -31,6 +31,7 @@ import logging from alembic import op import sqlalchemy as sa +from taskflow.persistence.backends.sqlalchemy import tables LOG = logging.getLogger(__name__) @@ -87,35 +88,44 @@ def upgrade(): sa.Column('created_at', sa.DateTime), sa.Column('updated_at', sa.DateTime), sa.Column('meta', sa.Text(), nullable=True), - sa.Column('name', sa.String(length=255), nullable=True), - sa.Column('uuid', sa.String(length=64), primary_key=True, - nullable=False), + sa.Column('name', sa.String(length=tables.NAME_LENGTH), + nullable=True), + sa.Column('uuid', sa.String(length=tables.UUID_LENGTH), + primary_key=True, nullable=False), mysql_engine='InnoDB', mysql_charset='utf8') op.create_table('flowdetails', sa.Column('created_at', sa.DateTime), sa.Column('updated_at', sa.DateTime), - sa.Column('parent_uuid', sa.String(length=64)), + sa.Column('parent_uuid', + sa.String(length=tables.UUID_LENGTH)), sa.Column('meta', sa.Text(), nullable=True), - sa.Column('state', sa.String(length=255), nullable=True), - sa.Column('name', sa.String(length=255), nullable=True), - sa.Column('uuid', sa.String(length=64), primary_key=True, - nullable=False), + sa.Column('state', sa.String(length=tables.STATE_LENGTH), + nullable=True), + sa.Column('name', sa.String(length=tables.NAME_LENGTH), + nullable=True), + sa.Column('uuid', sa.String(length=tables.UUID_LENGTH), + primary_key=True, nullable=False), mysql_engine='InnoDB', mysql_charset='utf8') op.create_table('taskdetails', sa.Column('created_at', sa.DateTime), sa.Column('updated_at', sa.DateTime), - sa.Column('parent_uuid', sa.String(length=64)), + sa.Column('parent_uuid', + sa.String(length=tables.UUID_LENGTH)), sa.Column('meta', sa.Text(), nullable=True), - sa.Column('name', sa.String(length=255), nullable=True), + sa.Column('name', sa.String(length=tables.NAME_LENGTH), + nullable=True), sa.Column('results', sa.Text(), nullable=True), - sa.Column('version', sa.String(length=64), nullable=True), + sa.Column('version', + sa.String(length=tables.VERSION_LENGTH), + nullable=True), sa.Column('stacktrace', sa.Text(), nullable=True), sa.Column('exception', sa.Text(), nullable=True), - sa.Column('state', sa.String(length=255), nullable=True), - sa.Column('uuid', sa.String(length=64), primary_key=True, - nullable=False), + sa.Column('state', sa.String(length=tables.STATE_LENGTH), + nullable=True), + sa.Column('uuid', sa.String(length=tables.UUID_LENGTH), + primary_key=True, nullable=False), mysql_engine='InnoDB', mysql_charset='utf8') try: