Skip to content

Commit

Permalink
Merge pull request #1942 from privacyidea/1875/fix_failing_migration_…
Browse files Browse the repository at this point in the history
…script

Add try..except to first migration script
  • Loading branch information
cornelinux committed Nov 26, 2019
2 parents d679b02 + 86efb30 commit f6e2c4c
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions migrations/versions/4f32a4e1bf33_.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from alembic import op
import sqlalchemy as sa
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker, Session as BaseSession, relationship
from sqlalchemy.orm import sessionmaker, relationship
from sqlalchemy.exc import ProgrammingError
import json

Session = sessionmaker()
Expand Down Expand Up @@ -498,14 +499,20 @@ def create_new_tables():


def upgrade():
create_update_token_table()
# rename the old table
op.rename_table('Config', 'Config_old')
create_resolver_config()
create_realms()
create_policy()
finalize_config()
create_new_tables()
try:
create_update_token_table()
# rename the old table
op.rename_table('Config', 'Config_old')
create_resolver_config()
create_realms()
create_policy()
finalize_config()
create_new_tables()
except ProgrammingError as exx:
print("An error occurred during upgrade! Maybe You database schema is "
"more recent than 2015? If this is the case, please check the "
"output if any changes were made to the db and revert them.")
print(exx)


def downgrade():
Expand Down

0 comments on commit f6e2c4c

Please sign in to comment.