From b9517146e2f085c31967a611b5b8d362f9347331 Mon Sep 17 00:00:00 2001 From: David Lenwell Date: Wed, 30 Oct 2013 04:13:17 -0700 Subject: [PATCH] redid alembic migration from scratch.. its was getting too messy --- .../16345354480e_added_config_to_test.py | 27 ------ .../versions/23f82f78731b_fixing_unique.py | 25 ------ .../2bad1445cf30_added_email_verfied_.py | 26 ------ .../2bf99fa45ded_remove_unique_restra.py | 22 ----- alembic/versions/2e26571834ea_first_step.py | 33 ------- alembic/versions/3790aed42558_from_scratch.py | 88 +++++++++++++++++++ .../40d4c6d389ec_adding_cloud_and_use.py | 47 ---------- .../501f41fac63a_additions_to_schema.py | 22 ----- .../versions/53fcc008b313_auto_generating.py | 56 ------------ .../5a5148d89f90_added_su_field_to_us.py | 25 ------ 10 files changed, 88 insertions(+), 283 deletions(-) delete mode 100755 alembic/versions/16345354480e_added_config_to_test.py delete mode 100755 alembic/versions/23f82f78731b_fixing_unique.py delete mode 100755 alembic/versions/2bad1445cf30_added_email_verfied_.py delete mode 100755 alembic/versions/2bf99fa45ded_remove_unique_restra.py delete mode 100755 alembic/versions/2e26571834ea_first_step.py create mode 100644 alembic/versions/3790aed42558_from_scratch.py delete mode 100755 alembic/versions/40d4c6d389ec_adding_cloud_and_use.py delete mode 100644 alembic/versions/501f41fac63a_additions_to_schema.py delete mode 100755 alembic/versions/53fcc008b313_auto_generating.py delete mode 100644 alembic/versions/5a5148d89f90_added_su_field_to_us.py diff --git a/alembic/versions/16345354480e_added_config_to_test.py b/alembic/versions/16345354480e_added_config_to_test.py deleted file mode 100755 index 4861d218..00000000 --- a/alembic/versions/16345354480e_added_config_to_test.py +++ /dev/null @@ -1,27 +0,0 @@ -"""added config to test table - -Revision ID: 16345354480e -Revises: 53fcc008b313 -Create Date: 2013-09-20 11:08:56.790834 - -""" - -# revision identifiers, used by Alembic. -revision = '16345354480e' -down_revision = '53fcc008b313' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.add_column('test', sa.Column('config', sa.String(length=4096), nullable=True)) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_column('test', 'config') - - ### end Alembic commands ### diff --git a/alembic/versions/23f82f78731b_fixing_unique.py b/alembic/versions/23f82f78731b_fixing_unique.py deleted file mode 100755 index 87db7722..00000000 --- a/alembic/versions/23f82f78731b_fixing_unique.py +++ /dev/null @@ -1,25 +0,0 @@ -"""Adding Cloud and User models - -Revision ID: 23f82f78731b -Revises: 40d4c6d389ec -Create Date: 2013-07-02 15:02:46.951119 - -""" - -# revision identifiers, used by Alembic. -revision = '23f82f78731b' -down_revision = '40d4c6d389ec' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - pass - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - pass - - ### end Alembic commands ### diff --git a/alembic/versions/2bad1445cf30_added_email_verfied_.py b/alembic/versions/2bad1445cf30_added_email_verfied_.py deleted file mode 100755 index 4fe9e28e..00000000 --- a/alembic/versions/2bad1445cf30_added_email_verfied_.py +++ /dev/null @@ -1,26 +0,0 @@ -"""added email_verfied column - -Revision ID: 2bad1445cf30 -Revises: 16345354480e -Create Date: 2013-09-20 12:01:59.881027 - -""" - -# revision identifiers, used by Alembic. -revision = '2bad1445cf30' -down_revision = '16345354480e' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.add_column('user', sa.Column('email_verified', sa.Boolean(create_constraint=False), nullable=True)) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_column('user', 'email_verified') - ### end Alembic commands ### diff --git a/alembic/versions/2bf99fa45ded_remove_unique_restra.py b/alembic/versions/2bf99fa45ded_remove_unique_restra.py deleted file mode 100755 index 524783e3..00000000 --- a/alembic/versions/2bf99fa45ded_remove_unique_restra.py +++ /dev/null @@ -1,22 +0,0 @@ -"""remove unique restraints from cloud add one to users - -Revision ID: 2bf99fa45ded -Revises: 23f82f78731b -Create Date: 2013-09-20 06:14:43.246339 - -""" - -# revision identifiers, used by Alembic. -revision = '2bf99fa45ded' -down_revision = '23f82f78731b' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - pass - - -def downgrade(): - pass diff --git a/alembic/versions/2e26571834ea_first_step.py b/alembic/versions/2e26571834ea_first_step.py deleted file mode 100755 index 08f1c736..00000000 --- a/alembic/versions/2e26571834ea_first_step.py +++ /dev/null @@ -1,33 +0,0 @@ -"""First step - -Revision ID: 2e26571834ea -Revises: None -Create Date: 2013-06-30 15:07:31.746984 - -""" - -# revision identifiers, used by Alembic. -revision = '2e26571834ea' -down_revision = None - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_table('vendor', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('vendor_name', sa.String(length=80), nullable=True), - sa.Column('contact_email', sa.String(length=120), nullable=True), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('contact_email'), - sa.UniqueConstraint('vendor_name') - ) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('vendor') - ### end Alembic commands ### \ No newline at end of file diff --git a/alembic/versions/3790aed42558_from_scratch.py b/alembic/versions/3790aed42558_from_scratch.py new file mode 100644 index 00000000..08f59164 --- /dev/null +++ b/alembic/versions/3790aed42558_from_scratch.py @@ -0,0 +1,88 @@ +"""from scratch + +Revision ID: 3790aed42558 +Revises: None +Create Date: 2013-10-30 03:52:16.922050 + +""" + +# revision identifiers, used by Alembic. +revision = '3790aed42558' +down_revision = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('cloud', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('label', sa.String(length=60), nullable=True), + sa.Column('endpoint', sa.String(length=120), nullable=True), + sa.Column('test_user', sa.String(length=80), nullable=True), + sa.Column('test_key', sa.String(length=80), nullable=True), + sa.Column('admin_endpoint', sa.String(length=120), nullable=True), + sa.Column('admin_user', sa.String(length=80), nullable=True), + sa.Column('admin_key', sa.String(length=80), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('endpoint') + ) + op.create_table('vendor', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('vendor_name', sa.String(length=80), nullable=True), + sa.Column('contact_email', sa.String(length=120), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('contact_email'), + sa.UniqueConstraint('vendor_name') + ) + op.create_table('user', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('vendor_id', sa.Integer(), nullable=True), + sa.Column('name', sa.String(length=60), nullable=True), + sa.Column('email', sa.String(length=200), nullable=True), + sa.Column('email_verified', sa.Boolean(), nullable=True), + sa.Column('openid', sa.String(length=200), nullable=True), + sa.Column('authorized', sa.Boolean(), nullable=True), + sa.Column('su', sa.Boolean(), nullable=True), + sa.ForeignKeyConstraint(['vendor_id'], ['vendor.id'], ), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('email'), + sa.UniqueConstraint('openid') + ) + op.create_table('test', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('cloud_id', sa.Integer(), nullable=True), + sa.Column('config', sa.String(length=4096), nullable=True), + sa.ForeignKeyConstraint(['cloud_id'], ['cloud.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('test_results', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('test_id', sa.Integer(), nullable=True), + sa.Column('timestamp', sa.DateTime(), nullable=True), + sa.Column('blob', sa.Binary(), nullable=True), + sa.ForeignKeyConstraint(['test_id'], ['test.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('test_status', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('test_id', sa.Integer(), nullable=True), + sa.Column('message', sa.String(length=1024), nullable=True), + sa.Column('finished', sa.Boolean(), nullable=True), + sa.Column('timestamp', sa.DateTime(), nullable=True), + sa.ForeignKeyConstraint(['test_id'], ['test.id'], ), + sa.PrimaryKeyConstraint('id') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('test_status') + op.drop_table('test_results') + op.drop_table('test') + op.drop_table('user') + op.drop_table('vendor') + op.drop_table('cloud') + ### end Alembic commands ### diff --git a/alembic/versions/40d4c6d389ec_adding_cloud_and_use.py b/alembic/versions/40d4c6d389ec_adding_cloud_and_use.py deleted file mode 100755 index ea4baf07..00000000 --- a/alembic/versions/40d4c6d389ec_adding_cloud_and_use.py +++ /dev/null @@ -1,47 +0,0 @@ -"""Adding Cloud and User models - -Revision ID: 40d4c6d389ec -Revises: 2e26571834ea -Create Date: 2013-07-02 15:02:46.951119 - -""" - -# revision identifiers, used by Alembic. -revision = '40d4c6d389ec' -down_revision = '2e26571834ea' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_table('user', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(length=60), nullable=True), - sa.Column('email', sa.String(length=200), nullable=True), - sa.Column('openid', sa.String(length=200), nullable=True), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('openid') - ) - op.create_table('cloud', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('vendor_id', sa.Integer(), nullable=True), - sa.Column('endpoint', sa.String(length=120), nullable=True), - sa.Column('test_user', sa.String(length=80), nullable=True), - sa.Column('test_key', sa.String(length=80), nullable=True), - sa.Column('admin_endpoint', sa.String(length=120), nullable=True), - sa.Column('admin_user', sa.String(length=80), nullable=True), - sa.Column('admin_key', sa.String(length=80), nullable=True), - sa.ForeignKeyConstraint(['vendor_id'], ['vendor.id'], ), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('endpoint') - ) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('cloud') - op.drop_table('user') - ### end Alembic commands ### diff --git a/alembic/versions/501f41fac63a_additions_to_schema.py b/alembic/versions/501f41fac63a_additions_to_schema.py deleted file mode 100644 index 8aaddaa3..00000000 --- a/alembic/versions/501f41fac63a_additions_to_schema.py +++ /dev/null @@ -1,22 +0,0 @@ -"""additions to schema - -Revision ID: 501f41fac63a -Revises: 2bf99fa45ded -Create Date: 2013-09-20 10:18:32.223074 - -""" - -# revision identifiers, used by Alembic. -revision = '501f41fac63a' -down_revision = '2bf99fa45ded' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - pass - - -def downgrade(): - pass diff --git a/alembic/versions/53fcc008b313_auto_generating.py b/alembic/versions/53fcc008b313_auto_generating.py deleted file mode 100755 index 0cb47473..00000000 --- a/alembic/versions/53fcc008b313_auto_generating.py +++ /dev/null @@ -1,56 +0,0 @@ -"""auto generating - -Revision ID: 53fcc008b313 -Revises: 501f41fac63a -Create Date: 2013-09-20 10:30:23.782772 - -""" - -# revision identifiers, used by Alembic. -revision = '53fcc008b313' -down_revision = '501f41fac63a' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_table('test', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('cloud_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['cloud_id'], ['cloud.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('test_results', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('test_id', sa.Integer(), nullable=True), - sa.Column('timestamp', sa.DateTime(), nullable=True), - sa.Column('blob', sa.Binary(), nullable=True), - sa.ForeignKeyConstraint(['test_id'], ['test.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('test_status', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('test_id', sa.Integer(), nullable=True), - sa.Column('message', sa.String(length=1024), nullable=True), - sa.Column('finished', sa.Boolean(), nullable=False), - sa.Column('timestamp', sa.DateTime(), nullable=True), - sa.ForeignKeyConstraint(['test_id'], ['test.id'], ), - sa.PrimaryKeyConstraint('id') - ) - - op.add_column(u'user', sa.Column('vendor_id',sa.Integer(), nullable=True)) - op.add_column(u'user', sa.Column('authorized',sa.Boolean(create_constraint=False),nullable=True )) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_column(u'user', 'authorized') - op.drop_column(u'user', 'vendor_id') - op.add_column(u'cloud', sa.Column(u'vendor_id', sa.INTEGER(), nullable=True)) - op.drop_table('test_status') - op.drop_table('test_results') - op.drop_table('test') - ### end Alembic commands ### diff --git a/alembic/versions/5a5148d89f90_added_su_field_to_us.py b/alembic/versions/5a5148d89f90_added_su_field_to_us.py deleted file mode 100644 index e53475c6..00000000 --- a/alembic/versions/5a5148d89f90_added_su_field_to_us.py +++ /dev/null @@ -1,25 +0,0 @@ -"""added su field to user - -Revision ID: 5a5148d89f90 -Revises: 2bad1445cf30 -Create Date: 2013-10-30 01:39:37.546697 - -""" - -# revision identifiers, used by Alembic. -revision = '5a5148d89f90' -down_revision = '2bad1445cf30' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.add_column('user', sa.Column('su', sa.Boolean())) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_column('user', 'su')