1
=== modified file 'openlp/plugins/bibles/lib/upgrade.py'
2
--- openlp/plugins/bibles/lib/upgrade.py	2014-01-14 19:25:18 +0000
3
+++ openlp/plugins/bibles/lib/upgrade.py	2014-03-18 19:36:20 +0000
4
@@ -37,6 +37,7 @@
5
37
__version__ = 1
37
__version__ = 1
6
38
log = logging.getLogger(__name__)
38
log = logging.getLogger(__name__)
7
39
39
8
40
9
40
def upgrade_setup(metadata):
41
def upgrade_setup(metadata):
10
41
    """
42
    """
11
42
    Set up the latest revision all tables, with reflection, needed for the
43
    Set up the latest revision all tables, with reflection, needed for the
12
@@ -61,31 +62,37 @@
13
61
    metadata_table = metadata.tables[u'metadata']
62
    metadata_table = metadata.tables[u'metadata']
14
62
    # Copy "Version" to "name" ("version" used by upgrade system)
63
    # Copy "Version" to "name" ("version" used by upgrade system)
15
63
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
64
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
23
64
    session.execute(insert(metadata_table).values(
65
    if select([metadata_table.c.value], metadata_table.c.key == u'Version')\
24
65
        key=u'name',
66
            .as_scalar().execute().fetchall():
25
66
        value=select(
67
        session.execute(insert(metadata_table).values(
26
67
            [metadata_table.c.value],
68
            key=u'name',
27
68
            metadata_table.c.key == u'Version'
69
            value=select(
28
69
        ).as_scalar()
70
                [metadata_table.c.value],
29
70
    ))
71
                metadata_table.c.key == u'Version'
30
72
            ).as_scalar()
31
73
        ))
32
71
    # Copy "Copyright" to "copyright"
74
    # Copy "Copyright" to "copyright"
33
72
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
75
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
41
73
    session.execute(insert(metadata_table).values(
76
    if select([metadata_table.c.value], metadata_table.c.key == u'Copyright')\
42
74
        key=u'copyright',
77
            .as_scalar().execute().fetchall():
43
75
        value=select(
78
        session.execute(insert(metadata_table).values(
44
76
            [metadata_table.c.value],
79
            key=u'copyright',
45
77
            metadata_table.c.key == u'Copyright'
80
            value=select(
46
78
        ).as_scalar()
81
                [metadata_table.c.value],
47
79
    ))
82
                metadata_table.c.key == u'Copyright'
48
83
            ).as_scalar()
49
84
        ))
50
80
    # Copy "Permissions" to "permissions"
85
    # Copy "Permissions" to "permissions"
51
81
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
86
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
59
82
    session.execute(insert(metadata_table).values(
87
    if select([metadata_table.c.value], metadata_table.c.key == u'Permissions')\
60
83
        key=u'permissions',
88
            .as_scalar().execute().fetchall():
61
84
        value=select(
89
        session.execute(insert(metadata_table).values(
62
85
            [metadata_table.c.value],
90
            key=u'permissions',
63
86
            metadata_table.c.key == u'Permissions'
91
            value=select(
64
87
        ).as_scalar()
92
                [metadata_table.c.value],
65
88
    ))
93
                metadata_table.c.key == u'Permissions'
66
94
            ).as_scalar()
67
95
        ))
68
89
    # Copy "Bookname language" to "book_name_language"
96
    # Copy "Bookname language" to "book_name_language"
69
90
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
97
    # TODO: Clean up in a subsequent release of OpenLP (like 2.0 final)
70
91
    value_count = session.execute(
98
    value_count = session.execute(
71
92
99
72
=== modified file 'openlp/plugins/songs/lib/upgrade.py'
73
--- openlp/plugins/songs/lib/upgrade.py	2014-01-14 19:25:18 +0000
74
+++ openlp/plugins/songs/lib/upgrade.py	2014-03-18 19:36:20 +0000
75
@@ -30,18 +30,24 @@
76
30
The :mod:`upgrade` module provides a way for the database and schema that is the
30
The :mod:`upgrade` module provides a way for the database and schema that is the
77
31
backend for the Songs plugin
31
backend for the Songs plugin
78
32
"""
32
"""
79
33
import logging
80
33
34
81
34
from sqlalchemy import Column, Table, types
35
from sqlalchemy import Column, Table, types
82
36
from sqlalchemy.exc import NoSuchTableError, OperationalError
83
35
from sqlalchemy.sql.expression import func
37
from sqlalchemy.sql.expression import func
84
36
from migrate.changeset.constraint import ForeignKeyConstraint
38
from migrate.changeset.constraint import ForeignKeyConstraint
85
37
39
86
40
log = logging.getLogger(__name__)
87
38
__version__ = 3
41
__version__ = 3
88
39
42
89
43
90
40
def upgrade_setup(metadata):
44
def upgrade_setup(metadata):
91
41
    """
45
    """
92
42
    Set up the latest revision all tables, with reflection, needed for the
46
    Set up the latest revision all tables, with reflection, needed for the
93
43
    upgrade process. If you want to drop a table, you need to remove it from
47
    upgrade process. If you want to drop a table, you need to remove it from
94
44
    here, and add it to your upgrade function.
48
    here, and add it to your upgrade function.
95
49
96
50
    :param metadata: The SQLAlchemy metadata object
97
45
    """
51
    """
98
46
    tables = {
52
    tables = {
99
47
        u'authors': Table(u'authors', metadata, autoload=True),
53
        u'authors': Table(u'authors', metadata, autoload=True),
100
@@ -66,16 +72,23 @@
101
66
    In order to facilitate this one-to-many relationship, a song_id column is
72
    In order to facilitate this one-to-many relationship, a song_id column is
102
67
    added to the media_files table, and a weight column so that the media
73
    added to the media_files table, and a weight column so that the media
103
68
    files can be ordered.
74
    files can be ordered.
104
75
105
76
    :param session: An SQLAlchemy Session object
106
77
    :param metadata: An SQLAlchemy MetaData object
107
78
    :param tables: A dictionary of tables
108
69
    """
79
    """
118
70
    Table(u'media_files_songs', metadata, autoload=True).drop(checkfirst=True)
80
    try:
119
71
    Column(u'song_id', types.Integer(), default=None)\
81
        Table(u'media_files_songs', metadata, autoload=True).drop(checkfirst=True)
120
72
        .create(table=tables[u'media_files'])
82
        Column(u'song_id', types.Integer(), default=None)\
121
73
    Column(u'weight', types.Integer(), default=0)\
83
            .create(table=tables[u'media_files'])
122
74
        .create(table=tables[u'media_files'])
84
        Column(u'weight', types.Integer(), default=0)\
123
75
    if metadata.bind.url.get_dialect().name != 'sqlite':
85
            .create(table=tables[u'media_files'])
124
76
        # SQLite doesn't support ALTER TABLE ADD CONSTRAINT
86
        if metadata.bind.url.get_dialect().name != 'sqlite':
125
77
        ForeignKeyConstraint([u'song_id'], [u'songs.id'],
87
            # SQLite doesn't support ALTER TABLE ADD CONSTRAINT
126
78
            table=tables[u'media_files']).create()
88
            ForeignKeyConstraint([u'song_id'], [u'songs.id'],
127
89
                table=tables[u'media_files']).create()
128
90
    except (NoSuchTableError, OperationalError):
129
91
        log.info(u'Upgrade 1 has already been run, continue with upgrade')
130
79
92
131
80
93
132
81
def upgrade_2(session, metadata, tables):
94
def upgrade_2(session, metadata, tables):
133
@@ -83,11 +96,18 @@
134
83
    Version 2 upgrade.
96
    Version 2 upgrade.
135
84
97
136
85
    This upgrade adds a create_date and last_modified date to the songs table
98
    This upgrade adds a create_date and last_modified date to the songs table
137
99
138
100
    :param session: An SQLAlchemy Session object
139
101
    :param metadata: An SQLAlchemy MetaData object
140
102
    :param tables: A dictionary of tables
141
86
    """
103
    """
146
87
    Column(u'create_date', types.DateTime(), default=func.now())\
104
    try:
147
88
        .create(table=tables[u'songs'])
105
        Column(u'create_date', types.DateTime(), default=func.now())\
148
89
    Column(u'last_modified', types.DateTime(), default=func.now())\
106
            .create(table=tables[u'songs'])
149
90
        .create(table=tables[u'songs'])
107
        Column(u'last_modified', types.DateTime(), default=func.now())\
150
108
            .create(table=tables[u'songs'])
151
109
    except OperationalError:
152
110
        log.info(u'Upgrade 2 has already been run, continue with upgrade')
153
91
111
154
92
112
155
93
def upgrade_3(session, metadata, tables):
113
def upgrade_3(session, metadata, tables):
156
@@ -95,7 +115,13 @@
157
95
    Version 3 upgrade.
115
    Version 3 upgrade.
158
96
116
159
97
    This upgrade adds a temporary song flag to the songs table
117
    This upgrade adds a temporary song flag to the songs table
160
118
161
119
    :param session: An SQLAlchemy Session object
162
120
    :param metadata: An SQLAlchemy MetaData object
163
121
    :param tables: A dictionary of tables
164
98
    """
122
    """
168
99
    Column(u'temporary', types.Boolean(), default=False)\
123
    try:
169
100
        .create(table=tables[u'songs'])
124
        Column(u'temporary', types.Boolean(), default=False)\
170
101
125
            .create(table=tables[u'songs'])
171
126
    except OperationalError:
172
127
        log.info(u'Upgrade 3 has already been run, continue with upgrade')
173
102
128
174
=== modified file 'openlp/plugins/songusage/lib/upgrade.py'
175
--- openlp/plugins/songusage/lib/upgrade.py	2014-01-14 19:25:18 +0000
176
+++ openlp/plugins/songusage/lib/upgrade.py	2014-03-18 19:36:20 +0000
177
@@ -30,11 +30,15 @@
178
30
The :mod:`upgrade` module provides a way for the database and schema that is the
30
The :mod:`upgrade` module provides a way for the database and schema that is the
179
31
backend for the SongsUsage plugin
31
backend for the SongsUsage plugin
180
32
"""
32
"""
181
33
import logging
182
33
34
183
34
from sqlalchemy import Column, Table, types
35
from sqlalchemy import Column, Table, types
184
36
from sqlalchemy.exc import OperationalError
185
35
37
186
38
log = logging.getLogger(__name__)
187
36
__version__ = 1
39
__version__ = 1
188
37
40
189
41
190
38
def upgrade_setup(metadata):
42
def upgrade_setup(metadata):
191
39
    """
43
    """
192
40
    Set up the latest revision all tables, with reflection, needed for the
44
    Set up the latest revision all tables, with reflection, needed for the
193
@@ -53,7 +57,10 @@
194
53
57
195
54
    This upgrade adds two new fields to the songusage database
58
    This upgrade adds two new fields to the songusage database
196
55
    """
59
    """
201
56
    Column(u'plugin_name', types.Unicode(20), default=u'') \
60
    try:
202
57
        .create(table=tables[u'songusage_data'], populate_default=True)
61
        Column(u'plugin_name', types.Unicode(20), default=u'') \
203
58
    Column(u'source', types.Unicode(10), default=u'') \
62
            .create(table=tables[u'songusage_data'], populate_default=True)
204
59
        .create(table=tables[u'songusage_data'], populate_default=True)
63
        Column(u'source', types.Unicode(10), default=u'') \
205
64
            .create(table=tables[u'songusage_data'], populate_default=True)
206
65
    except OperationalError:
207
66
        log.info(u'Upgrade 1 has already been run, continue with upgrade')
Status:	Merged
Merged at revision:	2191
Proposed branch:	lp:~raoul-snyman/openlp/bug-1136278-2.0
Merge into:	lp:openlp/2.0
Diff against target:	207 lines (+81/-41) 3 files modified openlp/plugins/bibles/lib/upgrade.py (+28/-21) openlp/plugins/songs/lib/upgrade.py (+42/-16) openlp/plugins/songusage/lib/upgrade.py (+11/-4)
To merge this branch:	bzr merge lp:~raoul-snyman/openlp/bug-1136278-2.0
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tim Bentley		2014-03-18	Approve on 2014-03-18
Review via email: mp+211610@code.launchpad.net