From a1e92f7150497cf9a7fbb49b53976e5fcfa0aa61 Mon Sep 17 00:00:00 2001 From: Jake Moshenko Date: Fri, 23 Oct 2015 16:15:09 -0400 Subject: [PATCH 1/2] Fix references to mysql in migrations --- .../127905a52fdd_remove_the_deprecated_imagestorage_.py | 9 ++++----- ...4fe12ade3df_add_build_queue_item_reference_to_the_.py | 1 - ...1594a74a74ca_add_metadata_field_to_external_logins.py | 1 - .../versions/17f11e265e13_add_uuid_field_to_user.py | 1 - .../versions/1c5b738283a5_backfill_user_uuids.py | 1 - .../versions/1d2d86d09fcd_actually_remove_the_column.py | 3 +-- .../201d55b38649_remove_fields_from_image_table_that_.py | 1 - data/migrations/versions/2088f2b81010_add_stars.py | 1 - .../versions/228d1af6af1c_mysql_max_index_lengths.py | 1 - .../versions/31288f79df53_make_resource_key_nullable.py | 5 ++--- .../313d297811c4_add_an_index_to_the_docker_image_id_.py | 1 - .../325a4d7c79d9_prepare_the_database_for_the_new_.py | 1 - .../versions/3fee6f979c2a_make_auth_token_nullable.py | 5 ++--- .../versions/4a0c94399f38_add_new_notification_kinds.py | 1 - ...db65816b8d_add_brute_force_prevention_metadata_to_.py | 1 - .../versions/5ad999136045_add_signature_storage.py | 1 - .../707d5191eda_change_build_queue_reference_from_.py | 3 +-- .../versions/82297d834ad_add_us_west_location.py | 1 - .../f42b0ea7a4d_remove_the_old_webhooks_table.py | 1 - 19 files changed, 10 insertions(+), 29 deletions(-) diff --git a/data/migrations/versions/127905a52fdd_remove_the_deprecated_imagestorage_.py b/data/migrations/versions/127905a52fdd_remove_the_deprecated_imagestorage_.py index 06c20c015..6ab6d79b7 100644 --- a/data/migrations/versions/127905a52fdd_remove_the_deprecated_imagestorage_.py +++ b/data/migrations/versions/127905a52fdd_remove_the_deprecated_imagestorage_.py @@ -12,7 +12,6 @@ down_revision = '2e0380215d01' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### @@ -25,8 +24,8 @@ def upgrade(tables): def downgrade(tables): ### commands auto generated by Alembic - please adjust! ### - op.add_column('imagestorage', sa.Column('created', mysql.DATETIME(), nullable=True)) - op.add_column('imagestorage', sa.Column('command', mysql.TEXT(), nullable=True)) - op.add_column('imagestorage', sa.Column('aggregate_size', mysql.BIGINT(display_width=20), autoincrement=False, nullable=True)) - op.add_column('imagestorage', sa.Column('comment', mysql.TEXT(), nullable=True)) + op.add_column('imagestorage', sa.Column('created', sa.DateTime(), nullable=True)) + op.add_column('imagestorage', sa.Column('command', sa.Text(), nullable=True)) + op.add_column('imagestorage', sa.Column('aggregate_size', sa.BigInteger(), nullable=True)) + op.add_column('imagestorage', sa.Column('comment', sa.Text(), nullable=True)) ### end Alembic commands ### diff --git a/data/migrations/versions/14fe12ade3df_add_build_queue_item_reference_to_the_.py b/data/migrations/versions/14fe12ade3df_add_build_queue_item_reference_to_the_.py index 5e8d21211..561a32dca 100644 --- a/data/migrations/versions/14fe12ade3df_add_build_queue_item_reference_to_the_.py +++ b/data/migrations/versions/14fe12ade3df_add_build_queue_item_reference_to_the_.py @@ -12,7 +12,6 @@ down_revision = '5ad999136045' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/1594a74a74ca_add_metadata_field_to_external_logins.py b/data/migrations/versions/1594a74a74ca_add_metadata_field_to_external_logins.py index 2f6c60706..e4276effe 100644 --- a/data/migrations/versions/1594a74a74ca_add_metadata_field_to_external_logins.py +++ b/data/migrations/versions/1594a74a74ca_add_metadata_field_to_external_logins.py @@ -12,7 +12,6 @@ down_revision = 'f42b0ea7a4d' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/17f11e265e13_add_uuid_field_to_user.py b/data/migrations/versions/17f11e265e13_add_uuid_field_to_user.py index 9371941f8..3bf692fe6 100644 --- a/data/migrations/versions/17f11e265e13_add_uuid_field_to_user.py +++ b/data/migrations/versions/17f11e265e13_add_uuid_field_to_user.py @@ -12,7 +12,6 @@ down_revision = '313d297811c4' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): diff --git a/data/migrations/versions/1c5b738283a5_backfill_user_uuids.py b/data/migrations/versions/1c5b738283a5_backfill_user_uuids.py index 44ea6f5ec..baa78465b 100644 --- a/data/migrations/versions/1c5b738283a5_backfill_user_uuids.py +++ b/data/migrations/versions/1c5b738283a5_backfill_user_uuids.py @@ -12,7 +12,6 @@ down_revision = '2fb36d4be80d' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql from util.migrate.backfill_user_uuids import backfill_user_uuids def upgrade(tables): diff --git a/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py b/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py index a7942b7d4..460296f17 100644 --- a/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py +++ b/data/migrations/versions/1d2d86d09fcd_actually_remove_the_column.py @@ -12,7 +12,6 @@ down_revision = '14fe12ade3df' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql from sqlalchemy.exc import InternalError def upgrade(tables): @@ -29,7 +28,7 @@ def upgrade(tables): def downgrade(tables): ### commands auto generated by Alembic - please adjust! ### try: - op.add_column('logentry', sa.Column('access_token_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True)) + op.add_column('logentry', sa.Column('access_token_id', sa.Integer(), nullable=True)) op.create_foreign_key(u'fk_logentry_access_token_id_accesstoken', 'logentry', 'accesstoken', ['access_token_id'], ['id']) op.create_index('logentry_access_token_id', 'logentry', ['access_token_id'], unique=False) except InternalError: diff --git a/data/migrations/versions/201d55b38649_remove_fields_from_image_table_that_.py b/data/migrations/versions/201d55b38649_remove_fields_from_image_table_that_.py index 8185c1118..02a119074 100644 --- a/data/migrations/versions/201d55b38649_remove_fields_from_image_table_that_.py +++ b/data/migrations/versions/201d55b38649_remove_fields_from_image_table_that_.py @@ -12,7 +12,6 @@ down_revision = '5a07499ce53f' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/2088f2b81010_add_stars.py b/data/migrations/versions/2088f2b81010_add_stars.py index ad4ccdf2b..af27da83e 100644 --- a/data/migrations/versions/2088f2b81010_add_stars.py +++ b/data/migrations/versions/2088f2b81010_add_stars.py @@ -12,7 +12,6 @@ down_revision = '707d5191eda' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): op.create_table('star', diff --git a/data/migrations/versions/228d1af6af1c_mysql_max_index_lengths.py b/data/migrations/versions/228d1af6af1c_mysql_max_index_lengths.py index 2f6ff722b..ed7fdc8be 100644 --- a/data/migrations/versions/228d1af6af1c_mysql_max_index_lengths.py +++ b/data/migrations/versions/228d1af6af1c_mysql_max_index_lengths.py @@ -12,7 +12,6 @@ down_revision = '5b84373e5db' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): op.drop_index('queueitem_queue_name', table_name='queueitem') diff --git a/data/migrations/versions/31288f79df53_make_resource_key_nullable.py b/data/migrations/versions/31288f79df53_make_resource_key_nullable.py index e52795ce6..e14dfaca1 100644 --- a/data/migrations/versions/31288f79df53_make_resource_key_nullable.py +++ b/data/migrations/versions/31288f79df53_make_resource_key_nullable.py @@ -12,12 +12,11 @@ down_revision = '214350b6a8b1' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### op.alter_column('repositorybuild', 'resource_key', - existing_type=mysql.VARCHAR(length=255), + existing_type=sa.String(length=255), nullable=True) ### end Alembic commands ### @@ -25,6 +24,6 @@ def upgrade(tables): def downgrade(tables): ### commands auto generated by Alembic - please adjust! ### op.alter_column('repositorybuild', 'resource_key', - existing_type=mysql.VARCHAR(length=255), + existing_type=sa.String(length=255), nullable=False) ### end Alembic commands ### diff --git a/data/migrations/versions/313d297811c4_add_an_index_to_the_docker_image_id_.py b/data/migrations/versions/313d297811c4_add_an_index_to_the_docker_image_id_.py index 2ed6bd2f5..3987fe2cc 100644 --- a/data/migrations/versions/313d297811c4_add_an_index_to_the_docker_image_id_.py +++ b/data/migrations/versions/313d297811c4_add_an_index_to_the_docker_image_id_.py @@ -12,7 +12,6 @@ down_revision = '204abf14783d' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py b/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py index d6bdcb35e..c11199a67 100644 --- a/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py +++ b/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py @@ -12,7 +12,6 @@ down_revision = '4b7ef0c7bdb2' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/3fee6f979c2a_make_auth_token_nullable.py b/data/migrations/versions/3fee6f979c2a_make_auth_token_nullable.py index 2574271ef..04379eb60 100644 --- a/data/migrations/versions/3fee6f979c2a_make_auth_token_nullable.py +++ b/data/migrations/versions/3fee6f979c2a_make_auth_token_nullable.py @@ -12,12 +12,11 @@ down_revision = '31288f79df53' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### op.alter_column('repositorybuildtrigger', 'auth_token', - existing_type=mysql.VARCHAR(length=255), + existing_type=sa.String(length=255), nullable=True) ### end Alembic commands ### @@ -25,6 +24,6 @@ def upgrade(tables): def downgrade(tables): ### commands auto generated by Alembic - please adjust! ### op.alter_column('repositorybuildtrigger', 'auth_token', - existing_type=mysql.VARCHAR(length=255), + existing_type=sa.String(length=255), nullable=False) ### end Alembic commands ### diff --git a/data/migrations/versions/4a0c94399f38_add_new_notification_kinds.py b/data/migrations/versions/4a0c94399f38_add_new_notification_kinds.py index 6b4160b19..efd3d1c60 100644 --- a/data/migrations/versions/4a0c94399f38_add_new_notification_kinds.py +++ b/data/migrations/versions/4a0c94399f38_add_new_notification_kinds.py @@ -12,7 +12,6 @@ down_revision = '1594a74a74ca' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): op.bulk_insert(tables.externalnotificationmethod, diff --git a/data/migrations/versions/4fdb65816b8d_add_brute_force_prevention_metadata_to_.py b/data/migrations/versions/4fdb65816b8d_add_brute_force_prevention_metadata_to_.py index bc8373655..42afef28f 100644 --- a/data/migrations/versions/4fdb65816b8d_add_brute_force_prevention_metadata_to_.py +++ b/data/migrations/versions/4fdb65816b8d_add_brute_force_prevention_metadata_to_.py @@ -12,7 +12,6 @@ down_revision = '43e943c0639f' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/5ad999136045_add_signature_storage.py b/data/migrations/versions/5ad999136045_add_signature_storage.py index f306c58b8..210b91175 100644 --- a/data/migrations/versions/5ad999136045_add_signature_storage.py +++ b/data/migrations/versions/5ad999136045_add_signature_storage.py @@ -12,7 +12,6 @@ down_revision = '228d1af6af1c' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### diff --git a/data/migrations/versions/707d5191eda_change_build_queue_reference_from_.py b/data/migrations/versions/707d5191eda_change_build_queue_reference_from_.py index 9b2110df7..dc8f88087 100644 --- a/data/migrations/versions/707d5191eda_change_build_queue_reference_from_.py +++ b/data/migrations/versions/707d5191eda_change_build_queue_reference_from_.py @@ -12,7 +12,6 @@ down_revision = '4ef04c61fcf9' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### @@ -26,7 +25,7 @@ def upgrade(tables): def downgrade(tables): ### commands auto generated by Alembic - please adjust! ### - op.add_column('repositorybuild', sa.Column('queue_item_id', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True)) + op.add_column('repositorybuild', sa.Column('queue_item_id', sa.Integer(), autoincrement=False, nullable=True)) op.create_foreign_key(u'fk_repositorybuild_queue_item_id_queueitem', 'repositorybuild', 'queueitem', ['queue_item_id'], ['id']) op.create_index('repositorybuild_queue_item_id', 'repositorybuild', ['queue_item_id'], unique=False) op.drop_index('repositorybuild_queue_id', table_name='repositorybuild') diff --git a/data/migrations/versions/82297d834ad_add_us_west_location.py b/data/migrations/versions/82297d834ad_add_us_west_location.py index b939a939e..33a543062 100644 --- a/data/migrations/versions/82297d834ad_add_us_west_location.py +++ b/data/migrations/versions/82297d834ad_add_us_west_location.py @@ -12,7 +12,6 @@ down_revision = '47670cbeced' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): op.bulk_insert(tables.imagestoragelocation, diff --git a/data/migrations/versions/f42b0ea7a4d_remove_the_old_webhooks_table.py b/data/migrations/versions/f42b0ea7a4d_remove_the_old_webhooks_table.py index 5b3f6c812..e36586a09 100644 --- a/data/migrations/versions/f42b0ea7a4d_remove_the_old_webhooks_table.py +++ b/data/migrations/versions/f42b0ea7a4d_remove_the_old_webhooks_table.py @@ -12,7 +12,6 @@ down_revision = '4fdb65816b8d' from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql def upgrade(tables): ### commands auto generated by Alembic - please adjust! ### From 5dd377400eec0c0b552fd5dc12d1c4ee84c055d5 Mon Sep 17 00:00:00 2001 From: Jake Moshenko Date: Fri, 23 Oct 2015 16:24:40 -0400 Subject: [PATCH 2/2] Test postgres before mysql variations in migration --- data/migrations/migration.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/migrations/migration.sh b/data/migrations/migration.sh index 9d20c5a6a..65521f6a6 100755 --- a/data/migrations/migration.sh +++ b/data/migrations/migration.sh @@ -108,6 +108,16 @@ test_migrate $MYSQL_CONFIG_OVERRIDE set -e down_mysql +# Test via Postgres. +echo '> Starting Postgres' +up_postgres + +echo '> Testing Migration (postgres)' +set +e +test_migrate $PGSQL_CONFIG_OVERRIDE +set -e +down_postgres + # Test via MariaDB. echo '> Starting MariaDB' up_mariadb @@ -127,13 +137,3 @@ set +e test_migrate $PERCONA_CONFIG_OVERRIDE set -e down_percona - -# Test via Postgres. -echo '> Starting Postgres' -up_postgres - -echo '> Testing Migration (postgres)' -set +e -test_migrate $PGSQL_CONFIG_OVERRIDE -set -e -down_postgres