openstack/deb-heat
Code Issues Proposed changes

Merge "db: Remove deprecated assert_unicode attribute"

Browse Source
This commit is contained in:
Jenkins 2013-08-09 03:02:37 +00:00 committed by Gerrit Code Review
commit 5518425daf
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py
View File

@ -22,11 +22,7 @@ def upgrade(migrate_engine):
# Align the current state/state_description with the # Align the current state/state_description with the
# action/status now used in the event table # action/status now used in the event table
action = sqlalchemy.Column('action', action = sqlalchemy.Column('action',
sqlalchemy.String(length=255, sqlalchemy.String(length=255))
convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False))
action.create(resource) action.create(resource)
resource.c.state.alter(name='status') resource.c.state.alter(name='status')
resource.c.state_description.alter(name='status_reason') resource.c.state_description.alter(name='status_reason')

6
heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py
View File

@ -21,11 +21,7 @@ def upgrade(migrate_engine):
stack = sqlalchemy.Table('stack', meta, autoload=True) stack = sqlalchemy.Table('stack', meta, autoload=True)
# Align with action/status now used in the event/resource tables # Align with action/status now used in the event/resource tables
action = sqlalchemy.Column('action', action = sqlalchemy.Column('action',
sqlalchemy.String(length=255, sqlalchemy.String(length=255))
convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False))
action.create(stack) action.create(stack)