Make String column creation compatible with SQLAlchemy 0.8

3 migration scripts used the convert_unicode, unicode_error, and
_warn_on_bytestring arguments when creating String columns.  These
seem to cause problems with SQLAlchemy 0.8.  Nova excised all use
of such arguments in commit 93dec58156e when squashing migrations
for Grizzly, and seems to have no problems with SQLAlchemy 0.8.

Fixes bug 1199453

Change-Id: Ie4b46339423e6a1ad3d8ca699a2412b825206c0e

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
index fe911c0d4062777f925a715def092006ee5072ad..736c03cb39ebf0dbd251a3d4771067f5c6f53e1e 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
@@ -35,16 +35,10 @@ def upgrade(migrate_engine):
                                                     name=None)),
                           Column('id', Integer(), primary_key=True),
                           Column('class_name',
-                                 String(length=255,
-                                        convert_unicode=True,
-                                        unicode_error=None,
-                                        _warn_on_bytestring=False),
+                                 String(length=255),
                                  index=True),
                           Column('resource',
-                                 String(length=255,
-                                        convert_unicode=True,
-                                        unicode_error=None,
-                                        _warn_on_bytestring=False)),
+                                 String(length=255)),
                           Column('hard_limit', Integer(), nullable=True),
                           mysql_engine='InnoDB',
                           mysql_charset='utf8',
@@ -64,14 +58,10 @@ def upgrade(migrate_engine):
                                                    name=None)),
                          Column('id', Integer(), primary_key=True),
                          Column('project_id',
-                                String(length=255, convert_unicode=True,
-                                       unicode_error=None,
-                                       _warn_on_bytestring=False),
+                                String(length=255),
                                 index=True),
                          Column('resource',
-                                String(length=255, convert_unicode=True,
-                                       unicode_error=None,
-                                       _warn_on_bytestring=False)),
+                                String(length=255)),
                          Column('in_use', Integer(), nullable=False),
                          Column('reserved', Integer(), nullable=False),
                          Column('until_refresh', Integer(), nullable=True),
@@ -93,24 +83,17 @@ def upgrade(migrate_engine):
                                                    name=None)),
                          Column('id', Integer(), primary_key=True),
                          Column('uuid',
-                                String(length=36,
-                                       convert_unicode=True,
-                                       unicode_error=None,
-                                       _warn_on_bytestring=False),
+                                String(length=36),
                                 nullable=False),
                          Column('usage_id',
                                 Integer(),
                                 ForeignKey('quota_usages.id'),
                                 nullable=False),
                          Column('project_id',
-                                String(length=255, convert_unicode=True,
-                                       unicode_error=None,
-                                       _warn_on_bytestring=False),
+                                String(length=255),
                                 index=True),
                          Column('resource',
-                                String(length=255, convert_unicode=True,
-                                       unicode_error=None,
-                                       _warn_on_bytestring=False)),
+                                String(length=255)),
                          Column('delta', Integer(), nullable=False),
                          Column('expire', DateTime(timezone=False)),
                          mysql_engine='InnoDB',

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
index 5dfbed0f63ef6285956a22fa7886b4cf60b77eba..f23f4e07e2a1c714b5e0cb7341b037c3bc53afd1 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
@@ -36,41 +36,17 @@ def upgrade(migrate_engine):
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', String(36), primary_key=True, nullable=False),
         Column('volume_id', String(36), nullable=False),
-        Column('user_id', String(length=255, convert_unicode=False,
-                                 unicode_error=None,
-                                 _warn_on_bytestring=False)),
-        Column('project_id', String(length=255, convert_unicode=False,
-                                    unicode_error=None,
-                                    _warn_on_bytestring=False)),
-        Column('host', String(length=255, convert_unicode=False,
-                              unicode_error=None,
-                              _warn_on_bytestring=False)),
-        Column('availability_zone', String(length=255,
-                                           convert_unicode=False,
-                                           unicode_error=None,
-                                           _warn_on_bytestring=False)),
-        Column('display_name', String(length=255, convert_unicode=False,
-                                      unicode_error=None,
-                                      _warn_on_bytestring=False)),
-        Column('display_description', String(length=255,
-                                             convert_unicode=False,
-                                             unicode_error=None,
-                                             _warn_on_bytestring=False)),
-        Column('container', String(length=255, convert_unicode=False,
-                                   unicode_error=None,
-                                   _warn_on_bytestring=False)),
-        Column('status', String(length=255, convert_unicode=False,
-                                unicode_error=None,
-                                _warn_on_bytestring=False)),
-        Column('fail_reason', String(length=255, convert_unicode=False,
-                                     unicode_error=None,
-                                     _warn_on_bytestring=False)),
-        Column('service_metadata', String(length=255, convert_unicode=False,
-                                          unicode_error=None,
-                                          _warn_on_bytestring=False)),
-        Column('service', String(length=255, convert_unicode=False,
-                                 unicode_error=None,
-                                 _warn_on_bytestring=False)),
+        Column('user_id', String(length=255)),
+        Column('project_id', String(length=255)),
+        Column('host', String(length=255)),
+        Column('availability_zone', String(length=255)),
+        Column('display_name', String(length=255)),
+        Column('display_description', String(length=255)),
+        Column('container', String(length=255)),
+        Column('status', String(length=255)),
+        Column('fail_reason', String(length=255)),
+        Column('service_metadata', String(length=255)),
+        Column('service', String(length=255)),
         Column('size', Integer()),
         Column('object_count', Integer()),
         mysql_engine='InnoDB'

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
index 3eae5df52b6033725dd2deda1ce1d7f6654eda15..781a443704d46128153431b1817ff30d6f7be733 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
@@ -36,18 +36,9 @@ def upgrade(migrate_engine):
         Column('id', String(36), primary_key=True, nullable=False),
         Column('volume_id', String(length=36), ForeignKey('volumes.id'),
                nullable=False),
-        Column('display_name', String(length=255,
-                                      convert_unicode=True,
-                                      unicode_error=None,
-                                      _warn_on_bytestring=False)),
-        Column('salt', String(length=255,
-                              convert_unicode=True,
-                              unicode_error=None,
-                              _warn_on_bytestring=False)),
-        Column('crypt_hash', String(length=255,
-                                    convert_unicode=True,
-                                    unicode_error=None,
-                                    _warn_on_bytestring=False)),
+        Column('display_name', String(length=255)),
+        Column('salt', String(length=255)),
+        Column('crypt_hash', String(length=255)),
         Column('expires_at', DateTime(timezone=False)),
         mysql_engine='InnoDB'
     )