openlp-core team mailing list archive

[Tomas Groth <tomasgroth@xxxxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/mysql into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/mysql/+merge/249422

Fixes for mysql as db backend.
-- 
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py	2015-01-18 13:39:21 +0000
+++ openlp/core/common/settings.py	2015-02-11 22:17:23 +0000
@@ -292,6 +292,10 @@
         'user interface/preview panel': True,
         'user interface/preview splitter geometry': QtCore.QByteArray(),
         'projector/db type': 'sqlite',
+        'projector/db username': '',
+        'projector/db password': '',
+        'projector/db hostname': '',
+        'projector/db database': '',
         'projector/enable': True,
         'projector/connect on start': False,
         'projector/last directory import': '',

=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py	2015-01-19 08:34:29 +0000
+++ openlp/core/lib/db.py	2015-02-11 22:17:23 +0000
@@ -81,9 +81,6 @@
                                        urlquote(settings.value('db password')),
                                        urlquote(settings.value('db hostname')),
                                        urlquote(settings.value('db database')))
-        if db_type == 'mysql':
-            db_encoding = settings.value('db encoding')
-            db_url += '?charset=%s' % urlquote(db_encoding)
     settings.endGroup()
     return db_url
 

=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/alerts/alertsplugin.py	2015-02-11 22:17:23 +0000
@@ -112,6 +112,10 @@
     'alerts/font face': QtGui.QFont().family(),
     'alerts/font size': 40,
     'alerts/db type': 'sqlite',
+    'alerts/db username': '',
+    'alerts/db password': '',
+    'alerts/db hostname': '',
+    'alerts/db database': '',
     'alerts/location': AlertLocation.Bottom,
     'alerts/background color': '#660000',
     'alerts/font color': '#ffffff',

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2015-02-11 22:17:23 +0000
@@ -37,6 +37,10 @@
 
 __default_settings__ = {
     'bibles/db type': 'sqlite',
+    'bibles/db username': '',
+    'bibles/db password': '',
+    'bibles/db hostname': '',
+    'bibles/db database': '',
     'bibles/last search type': BibleSearch.Reference,
     'bibles/verse layout style': LayoutStyle.VersePerSlide,
     'bibles/book name language': LanguageSelection.Bible,

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/custom/customplugin.py	2015-02-11 22:17:23 +0000
@@ -36,6 +36,10 @@
 
 __default_settings__ = {
     'custom/db type': 'sqlite',
+    'custom/db username': '',
+    'custom/db password': '',
+    'custom/db hostname': '',
+    'custom/db database': '',
     'custom/last search type': CustomSearch.Titles,
     'custom/display footer': True,
     'custom/add custom from service': True

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2015-01-22 17:31:00 +0000
+++ openlp/plugins/images/imageplugin.py	2015-02-11 22:17:23 +0000
@@ -35,6 +35,10 @@
 
 __default_settings__ = {
     'images/db type': 'sqlite',
+    'images/db username': '',
+    'images/db password': '',
+    'images/db hostname': '',
+    'images/db database': '',
     'images/background color': '#000000',
 }
 

=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/songs/lib/db.py	2015-02-11 22:17:23 +0000
@@ -312,7 +312,7 @@
         'authors_songs', metadata,
         Column('author_id', types.Integer(), ForeignKey('authors.id'), primary_key=True),
         Column('song_id', types.Integer(), ForeignKey('songs.id'), primary_key=True),
-        Column('author_type', types.String(), primary_key=True, nullable=False, server_default=text('""'))
+        Column('author_type', types.Unicode(255), primary_key=True, nullable=False, server_default=text('""'))
     )
 
     # Definition of the "songs_topics" table

=== modified file 'openlp/plugins/songs/lib/upgrade.py'
--- openlp/plugins/songs/lib/upgrade.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/songs/lib/upgrade.py	2015-02-11 22:17:23 +0000
@@ -109,7 +109,7 @@
         op.create_table('authors_songs_tmp',
                         Column('author_id', types.Integer(), ForeignKey('authors.id'), primary_key=True),
                         Column('song_id', types.Integer(), ForeignKey('songs.id'), primary_key=True),
-                        Column('author_type', types.String(), primary_key=True,
+                        Column('author_type', types.Unicode(255), primary_key=True,
                                nullable=False, server_default=text('""')))
         op.execute('INSERT INTO authors_songs_tmp SELECT author_id, song_id, "" FROM authors_songs')
         op.drop_table('authors_songs')

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/songs/songsplugin.py	2015-02-11 22:17:23 +0000
@@ -50,6 +50,10 @@
 log = logging.getLogger(__name__)
 __default_settings__ = {
     'songs/db type': 'sqlite',
+    'songs/db username': '',
+    'songs/db password': '',
+    'songs/db hostname': '',
+    'songs/db database': '',
     'songs/last search type': SongSearch.Entire,
     'songs/last import type': SongFormat.OpenLyrics,
     'songs/update service on edit': False,

=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/songusage/songusageplugin.py	2015-02-11 22:17:23 +0000
@@ -43,6 +43,10 @@
 
 __default_settings__ = {
     'songusage/db type': 'sqlite',
+    'songusage/db username': '',
+    'songuasge/db password': '',
+    'songuasge/db hostname': '',
+    'songuasge/db database': '',
     'songusage/active': False,
     'songusage/to date': QtCore.QDate(YEAR, 8, 31),
     'songusage/from date': QtCore.QDate(YEAR - 1, 9, 1),

=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py	2015-01-22 18:40:12 +0000
+++ scripts/check_dependencies.py	2015-02-11 22:17:23 +0000
@@ -83,7 +83,7 @@
 
 
 OPTIONAL_MODULES = [
-    ('MySQLdb', '(MySQL support)', True),
+    ('mysql.connector', '(MySQL support)', True),
     ('psycopg2', '(PostgreSQL support)', True),
     ('nose', '(testing framework)', True),
     ('mock',  '(testing module)', sys.version_info[1] < 3),