openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Matt Dietz 2013-01-21 17:40:50 +00:00
parent e2891257b7
commit 9baf9f037a
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
View File

@ -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

1
quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
View File

@ -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

23
quantum/db/migration/alembic_migrations/versions/48b6f43f7471_service_type.py
View File

@ -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'),