raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix migration for non-sqlite

Browse Source
This commit is contained in:
Samuel Mehrbrodt 2016-01-07 23:12:03 +01:00
parent 8780b74342
commit ddefceee04
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/core/utils/db.py
View File

@ -30,9 +30,12 @@ from copy import deepcopy
log = logging.getLogger(__name__)
def drop_column(op, tablename, columnname):
drop_columns(op, tablename, [columnname])
def drop_columns(op, tablename, columns):
"""
Column dropping functionality for SQLite, as there is no native support, neither in Alembic, nor in SQLite
Column dropping functionality for SQLite, as there is no DROP COLUMN support in SQLite
From https://github.com/klugjohannes/alembic-sqlite
"""
@ -65,7 +68,3 @@ def drop_columns(op, tablename, columns):
# position
op.drop_table(tablename)
op.rename_table(new_tablename, tablename)
def drop_column(op, tablename, columnname):
drop_columns(op, tablename, [columnname])

9
openlp/plugins/songs/lib/upgrade.py
View File

@ -139,7 +139,12 @@ def upgrade_5(session, metadata):
# Migrate old data
op.execute('INSERT INTO songs_songbooks SELECT song_book_id, id, song_number FROM songs\
WHERE song_book_id NOT NULL AND song_number NOT NULL')
WHERE song_book_id IS NOT NULL AND song_number IS NOT NULL')
# Drop old columns
drop_columns(op, 'songs', ['song_book_id', 'song_number'])
if metadata.bind.url.get_dialect().name == 'sqlite':
drop_columns(op, 'songs', ['song_book_id', 'song_number'])
else:
op.drop_constraint('songs_ibfk_1', 'songs', 'foreignkey')
op.drop_column('songs', 'song_book_id')
op.drop_column('songs', 'song_number')