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:
parent
e2891257b7
commit
9baf9f037a
|
@ -35,7 +35,6 @@ migration_for_plugins = [
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.dialects import mysql
|
|
||||||
|
|
||||||
from quantum.db import migration
|
from quantum.db import migration
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ migration_for_plugins = [
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.dialects import mysql
|
|
||||||
|
|
||||||
from quantum.db import migration
|
from quantum.db import migration
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ migration_for_plugins = [
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.dialects import mysql
|
|
||||||
|
|
||||||
from quantum.db import migration
|
from quantum.db import migration
|
||||||
|
|
||||||
|
@ -46,23 +45,23 @@ def upgrade(active_plugin=None, options=None):
|
||||||
|
|
||||||
op.create_table(
|
op.create_table(
|
||||||
u'servicetypes',
|
u'servicetypes',
|
||||||
sa.Column(u'tenant_id', mysql.VARCHAR(length=255), nullable=True),
|
sa.Column(u'tenant_id', sa.String(255), nullable=True),
|
||||||
sa.Column(u'id', mysql.VARCHAR(length=36), nullable=False),
|
sa.Column(u'id', sa.String(36), nullable=False),
|
||||||
sa.Column(u'name', mysql.VARCHAR(length=255), nullable=True),
|
sa.Column(u'name', sa.String(255), nullable=True),
|
||||||
sa.Column(u'description', mysql.VARCHAR(length=255), nullable=True),
|
sa.Column(u'description', sa.String(255), nullable=True),
|
||||||
sa.Column(u'default', mysql.TINYINT(display_width=1),
|
sa.Column(u'default', sa.Boolean(),
|
||||||
autoincrement=False, nullable=False),
|
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),
|
autoincrement=False, nullable=True),
|
||||||
sa.PrimaryKeyConstraint(u'id'))
|
sa.PrimaryKeyConstraint(u'id'))
|
||||||
op.create_table(
|
op.create_table(
|
||||||
u'servicedefinitions',
|
u'servicedefinitions',
|
||||||
sa.Column(u'id', mysql.VARCHAR(length=36), nullable=False),
|
sa.Column(u'id', sa.String(36), nullable=False),
|
||||||
sa.Column(u'service_class', mysql.VARCHAR(length=255),
|
sa.Column(u'service_class', sa.String(length=255),
|
||||||
nullable=False),
|
nullable=False),
|
||||||
sa.Column(u'plugin', mysql.VARCHAR(length=255), nullable=True),
|
sa.Column(u'plugin', sa.String(255), nullable=True),
|
||||||
sa.Column(u'driver', mysql.VARCHAR(length=255), nullable=True),
|
sa.Column(u'driver', sa.String(255), nullable=True),
|
||||||
sa.Column(u'service_type_id', mysql.VARCHAR(length=36),
|
sa.Column(u'service_type_id', sa.String(36),
|
||||||
nullable=False),
|
nullable=False),
|
||||||
sa.ForeignKeyConstraint(['service_type_id'], [u'servicetypes.id'],
|
sa.ForeignKeyConstraint(['service_type_id'], [u'servicetypes.id'],
|
||||||
name=u'servicedefinitions_ibfk_1'),
|
name=u'servicedefinitions_ibfk_1'),
|
||||||
|
|
Loading…
Reference in New Issue