From 866ddac06afb9329a12e04cb65b3a3feb2c6db51 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Tue, 30 Jul 2013 10:24:31 -0400 Subject: [PATCH] db: Remove deprecated assert_unicode attribute Remove deprecated assert_unicode sqlalchemy attribute, removed in sqlalchemy 0.8.0. The deprecation is described at: http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe Fixes LP: #1208382 Change-Id: I56ad98d3702f53fe8cfa94093fea89074f7a5e90 Signed-off-by: Chuck Short --- .../203_make_user_quotas_key_and_value.py | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py b/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py index 10755192dd4a..47cb3c796959 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py @@ -34,33 +34,25 @@ def upgrade(migrate_engine): # Add 'user_id' column to quota_usages table and its shadow table. quota_usages = utils.get_table(migrate_engine, 'quota_usages') user_id = Column('user_id', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False)) + String(length=255)) quota_usages.create_column(user_id) shadow_quota_usages = utils.get_table(migrate_engine, db._SHADOW_TABLE_PREFIX + 'quota_usages') user_id = Column('user_id', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False)) + String(length=255)) shadow_quota_usages.create_column(user_id) # Add 'user_id' column to reservations table and its shadow table. reservations = utils.get_table(migrate_engine, 'reservations') user_id = Column('user_id', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False)) + String(length=255)) reservations.create_column(user_id) shadow_reservations = utils.get_table(migrate_engine, db._SHADOW_TABLE_PREFIX + 'reservations') user_id = Column('user_id', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False)) + String(length=255)) shadow_reservations.create_column(user_id) indexes = [ @@ -82,19 +74,13 @@ def upgrade(migrate_engine): Column('deleted_at', DateTime), Column('deleted', Integer), Column('user_id', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False), + String(length=255), nullable=False), Column('project_id', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False), + String(length=255), nullable=False), Column('resource', - String(length=255, convert_unicode=False, - assert_unicode=None, unicode_error=None, - _warn_on_bytestring=False), + String(length=25), nullable=False), Column('hard_limit', Integer, nullable=True), UniqueConstraint('user_id', 'project_id', 'resource',