From: Matt Dietz <matt.dietz@rackspace.com>
Date: Mon, 21 Jan 2013 17:40:50 +0000 (+0000)
Subject: Enforces generic sqlalchemy types in migrations.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9baf9f037a6d0a14afb5244e06b5efc0deebe0e4;p=openstack-build%2Fneutron-build.git

Enforces generic sqlalchemy types in migrations.

Fixes bug 1102491

Modifies the service_type migration to use sqlalchemy types instead of
mysql types. Also removes the import of mysql from several of the
migrations.

Change-Id: I0495a711cd14f64ced4d32857e30586a42b83839
---

diff --git a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
index d00768bac..ae1035eaf 100644
--- a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
+++ b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
@@ -35,7 +35,6 @@ migration_for_plugins = [
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 from quantum.db import migration
 
diff --git a/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py b/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
index cf565af0f..889735b17 100644
--- a/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
+++ b/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
@@ -35,7 +35,6 @@ migration_for_plugins = [
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 from quantum.db import migration
 
diff --git a/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py b/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py
index 38d695e9f..80a4939d7 100644
--- a/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py
+++ b/quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py
@@ -35,7 +35,6 @@ migration_for_plugins = [
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 from quantum.db import migration
 
@@ -46,23 +45,23 @@ def upgrade(active_plugin=None, options=None):
 
     op.create_table(
         u'servicetypes',
-        sa.Column(u'tenant_id', mysql.VARCHAR(length=255), nullable=True),
-        sa.Column(u'id', mysql.VARCHAR(length=36), nullable=False),
-        sa.Column(u'name', mysql.VARCHAR(length=255), nullable=True),
-        sa.Column(u'description', mysql.VARCHAR(length=255), nullable=True),
-        sa.Column(u'default', mysql.TINYINT(display_width=1),
+        sa.Column(u'tenant_id', sa.String(255), nullable=True),
+        sa.Column(u'id', sa.String(36), nullable=False),
+        sa.Column(u'name', sa.String(255), nullable=True),
+        sa.Column(u'description', sa.String(255), nullable=True),
+        sa.Column(u'default', sa.Boolean(),
                   autoincrement=False, nullable=False),
-        sa.Column(u'num_instances', mysql.INTEGER(display_width=11),
+        sa.Column(u'num_instances', sa.Integer(),
                   autoincrement=False, nullable=True),
         sa.PrimaryKeyConstraint(u'id'))
     op.create_table(
         u'servicedefinitions',
-        sa.Column(u'id', mysql.VARCHAR(length=36), nullable=False),
-        sa.Column(u'service_class', mysql.VARCHAR(length=255),
+        sa.Column(u'id', sa.String(36), nullable=False),
+        sa.Column(u'service_class', sa.String(length=255),
                   nullable=False),
-        sa.Column(u'plugin', mysql.VARCHAR(length=255), nullable=True),
-        sa.Column(u'driver', mysql.VARCHAR(length=255), nullable=True),
-        sa.Column(u'service_type_id', mysql.VARCHAR(length=36),
+        sa.Column(u'plugin', sa.String(255), nullable=True),
+        sa.Column(u'driver', sa.String(255), nullable=True),
+        sa.Column(u'service_type_id', sa.String(36),
                   nullable=False),
         sa.ForeignKeyConstraint(['service_type_id'], [u'servicetypes.id'],
                                 name=u'servicedefinitions_ibfk_1'),