Merge "Do not create constraints for boolean fields"

This commit is contained in:
Zuul 2021-02-11 22:47:11 +00:00 committed by Gerrit Code Review
commit 8dcf91b2d3
12 changed files with 33 additions and 15 deletions

View File

@ -26,10 +26,14 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
insecure_column = sa.Column('insecure', sa.Boolean(), default=False) insecure_column = sa.Column('insecure',
sa.Boolean(create_constraint=False),
default=False)
op.add_column('baymodel', insecure_column) op.add_column('baymodel', insecure_column)
baymodel = sa.sql.table('baymodel', baymodel = sa.sql.table('baymodel',
sa.Column('insecure', sa.Boolean(), default=False)) sa.Column('insecure',
sa.Boolean(create_constraint=False),
default=False))
op.execute( op.execute(
baymodel.update().values({'insecure': True}) baymodel.update().values({'insecure': True})
) )

View File

@ -35,14 +35,18 @@ def upgrade():
sa.Column('report_count', sa.Integer(), nullable=False), sa.Column('report_count', sa.Integer(), nullable=False),
sa.Column('host', sa.String(length=255), nullable=True), sa.Column('host', sa.String(length=255), nullable=True),
sa.Column('binary', sa.String(length=255), nullable=True), sa.Column('binary', sa.String(length=255), nullable=True),
sa.Column('disabled', sa.Boolean(), nullable=True), sa.Column('disabled',
sa.Boolean(create_constraint=False),
nullable=True),
sa.Column('disabled_reason', sa.String(length=255), nullable=True), sa.Column('disabled_reason', sa.String(length=255), nullable=True),
# 'last_seen_up' has different purpose than 'updated_at'. # 'last_seen_up' has different purpose than 'updated_at'.
# 'updated_at' refers to any modification of the entry, which can # 'updated_at' refers to any modification of the entry, which can
# be administrative too, whereas 'last_seen_up' is more related to # be administrative too, whereas 'last_seen_up' is more related to
# magnum_service. Modeled after nova/servicegroup # magnum_service. Modeled after nova/servicegroup
sa.Column('last_seen_up', sa.DateTime(), nullable=True), sa.Column('last_seen_up', sa.DateTime(), nullable=True),
sa.Column('forced_down', sa.Boolean(), nullable=True), sa.Column('forced_down',
sa.Boolean(create_constraint=False),
nullable=True),
sa.PrimaryKeyConstraint('id'), sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('host', 'binary', sa.UniqueConstraint('host', 'binary',
name='uniq_magnum_service0host0binary') name='uniq_magnum_service0host0binary')

View File

@ -29,4 +29,6 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
op.add_column('baymodel', sa.Column('public', sa.Boolean(), default=False)) op.add_column('baymodel', sa.Column('public',
sa.Boolean(create_constraint=False),
default=False))

View File

@ -60,7 +60,7 @@ def upgrade():
sa.Column('max_node_count', sa.Integer, nullable=True), sa.Column('max_node_count', sa.Integer, nullable=True),
sa.Column('min_node_count', sa.Integer, nullable=True), sa.Column('min_node_count', sa.Integer, nullable=True),
sa.Column('role', String(length=255), nullable=True), sa.Column('role', String(length=255), nullable=True),
sa.Column('is_default', sa.Boolean()) sa.Column('is_default', sa.Boolean(create_constraint=False))
) )
connection = op.get_bind() connection = op.get_bind()

View File

@ -36,5 +36,5 @@ def upgrade():
String(255, mysql_ndb_type=TINYTEXT), String(255, mysql_ndb_type=TINYTEXT),
nullable=True)) nullable=True))
op.add_column('cluster', sa.Column('floating_ip_enabled', op.add_column('cluster', sa.Column('floating_ip_enabled',
sa.Boolean(), sa.Boolean(create_constraint=False),
default=False)) default=False))

View File

@ -27,4 +27,4 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
op.add_column('baymodel', sa.Column('registry_enabled', op.add_column('baymodel', sa.Column('registry_enabled',
sa.Boolean(), default=False)) sa.Boolean(create_constraint=False), default=False))

View File

@ -28,4 +28,4 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
op.alter_column('baymodel', 'insecure', op.alter_column('baymodel', 'insecure',
new_column_name='tls_disabled', new_column_name='tls_disabled',
existing_type=sa.Boolean()) existing_type=sa.Boolean(create_constraint=False))

View File

@ -27,4 +27,6 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
op.add_column('baymodel', op.add_column('baymodel',
sa.Column('master_lb_enabled', sa.Boolean(), default=False)) sa.Column('master_lb_enabled',
sa.Boolean(create_constraint=False),
default=False))

View File

@ -26,5 +26,7 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
op.add_column('cluster_template', sa.Column('hidden', sa.Boolean(), op.add_column('cluster_template',
default=False)) sa.Column('hidden',
sa.Boolean(create_constraint=False),
default=False))

View File

@ -28,7 +28,9 @@ down_revision = 'c04e925e65c2'
def upgrade(): def upgrade():
op.add_column('cluster', op.add_column('cluster',
sa.Column('master_lb_enabled', sa.Boolean(), default=False)) sa.Column('master_lb_enabled',
sa.Boolean(create_constraint=False),
default=False))
# Populate existing cluster with the cluster template_id # Populate existing cluster with the cluster template_id
connection = op.get_bind() connection = op.get_bind()
connection.execute( connection.execute(

View File

@ -53,7 +53,9 @@ def upgrade():
sa.Column('max_node_count', sa.Integer(), nullable=True), sa.Column('max_node_count', sa.Integer(), nullable=True),
sa.Column('min_node_count', sa.Integer(), nullable=True), sa.Column('min_node_count', sa.Integer(), nullable=True),
sa.Column('role', String(length=255), nullable=True), sa.Column('role', String(length=255), nullable=True),
sa.Column('is_default', sa.Boolean(), default=False), sa.Column('is_default',
sa.Boolean(create_constraint=False),
default=False),
sa.PrimaryKeyConstraint('id'), sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('uuid', name='uniq_nodegroup0uuid'), sa.UniqueConstraint('uuid', name='uniq_nodegroup0uuid'),
sa.UniqueConstraint('cluster_id', 'name', sa.UniqueConstraint('cluster_id', 'name',

View File

@ -28,5 +28,5 @@ import sqlalchemy as sa # noqa: E402
def upgrade(): def upgrade():
op.add_column('baymodel', op.add_column('baymodel',
sa.Column('floating_ip_enabled', sa.Column('floating_ip_enabled',
sa.Boolean(), sa.Boolean(create_constraint=False),
default=True)) default=True))