Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Henjuro committed Sep 20, 2017
2 parents 5aa80c7 + 3ac85b3 commit 2c25762
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#Changelog

* 1.0.2
* Fixes
* fixed migration scripts to only use lowercase table names, this should fix problems with database configured to support casesensitive table names
* 1.0.1
* Changes
* Improved system/constellation import speed, also should properly retry failed imports now (timeouts etc.)
Expand Down
4 changes: 2 additions & 2 deletions migrations/versions/052e5edbdf5d_.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

def upgrade():
### commands auto generated by Alembic - please adjust! ###
op.drop_index('ix_EveApiScope_scopeName', table_name='eveapiscope')
op.drop_index('ix_eveapiscope_scopeName', table_name='eveapiscope')
op.add_column('accounts', sa.Column('had_welcome_mail', sa.Boolean(), server_default=sa.text(u'false'), nullable=True))
op.create_index(op.f('ix_eveapiscope_scopeName'), 'eveapiscope', ['scopeName'], unique=False)
### end Alembic commands ###
Expand All @@ -24,7 +24,7 @@ def upgrade():
def downgrade():
### commands auto generated by Alembic - please adjust! ##
op.drop_index(op.f('ix_eveapiscope_scopeName'), table_name='eveapiscope')
op.create_index('ix_EveApiScope_scopeName', 'eveapiscope', ['scopeName'], unique=False)
op.create_index('ix_eveapiscope_scopeName', 'eveapiscope', ['scopeName'], unique=False)
op.drop_column('accounts', 'had_welcome_mail')

### end Alembic commands ###
20 changes: 10 additions & 10 deletions migrations/versions/9ad747adbff1_.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@

def upgrade():
### commands auto generated by Alembic - please adjust! ###
op.create_table('EveApiScope',
op.create_table('eveapiscope',
sa.Column('scopeID', sa.Integer(), nullable=False),
sa.Column('scopeName', sa.String(length=100), nullable=True),
sa.PrimaryKeyConstraint('scopeID')
)
op.create_index(op.f('ix_EveApiScope_scopeName'), 'EveApiScope', ['scopeName'], unique=False)
op.create_table('SSOToken',
op.create_index(op.f('ix_eveapiscope_scopeName'), 'eveapiscope', ['scopeName'], unique=False)
op.create_table('ssotoken',
sa.Column('accountID', sa.Integer(), nullable=False),
sa.Column('refresh_token', sa.String(length=128), nullable=True),
sa.Column('access_token', sa.String(length=128), nullable=True),
sa.Column('access_token_expires', sa.DateTime(), nullable=True),
sa.ForeignKeyConstraint(['accountID'], ['accounts.id'], ),
sa.PrimaryKeyConstraint('accountID')
)
op.create_table('TokenScope',
op.create_table('tokenscope',
sa.Column('tokenID', sa.Integer(), nullable=False),
sa.Column('scopeID', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['scopeID'], ['EveApiScope.scopeID'], ),
sa.ForeignKeyConstraint(['tokenID'], ['SSOToken.accountID'], ),
sa.ForeignKeyConstraint(['scopeID'], ['eveapiscope.scopeID'], ),
sa.ForeignKeyConstraint(['tokenID'], ['ssotoken.accountID'], ),
sa.PrimaryKeyConstraint('tokenID', 'scopeID')
)
#op.create_index(op.f('ix_account_notes_time'), 'account_notes', ['time'], unique=False)
Expand All @@ -52,8 +52,8 @@ def downgrade():
op.add_column(u'accounts', sa.Column('access_token', mysql.VARCHAR(length=128), nullable=True))
op.create_index('ix_role_history_time', 'account_notes', ['time'], unique=False)
op.drop_index(op.f('ix_account_notes_time'), table_name='account_notes')
op.drop_table('TokenScope')
op.drop_table('SSOToken')
op.drop_index(op.f('ix_EveApiScope_scopeName'), table_name='EveApiScope')
op.drop_table('EveApiScope')
op.drop_table('tokenscope')
op.drop_table('ssotoken')
op.drop_index(op.f('ix_eveapiscope_scopeName'), table_name='eveapiscope')
op.drop_table('eveapiscope')
### end Alembic commands ###
2 changes: 1 addition & 1 deletion waitlist/data/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "1.0.1-$Format:%h$"
version = "1.0.2-$Format:%h$"

0 comments on commit 2c25762

Please sign in to comment.