openlp-core team mailing list archive

[Rastislav Pecik <rapecik@xxxxxxxxx>]

Rastislav Pecik has proposed merging lp:~rapecik/openlp/bug-941692 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #941692 in OpenLP: "Wrong encoding when connecting to mysql database"
  https://bugs.launchpad.net/openlp/+bug/941692

For more details, see:
https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94702

Fixed bug 941692
-- 
https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94702
Your team OpenLP Core is requested to review the proposed merge of lp:~rapecik/openlp/bug-941692 into lp:openlp.

=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py	2012-02-16 19:05:16 +0000
+++ openlp/core/lib/db.py	2012-02-27 00:49:18 +0000
@@ -193,6 +193,12 @@
             else:
                 self.db_url = u'sqlite:///%s/%s.sqlite' % (
                     AppLocation.get_section_data_path(plugin_name), plugin_name)
+        elif db_type == u'mysql' :
+            self.db_url = u'%s://%s:%s@%s/%s?charset=utf8' % (db_type,
+                urlquote(unicode(settings.value(u'db username').toString())),
+                urlquote(unicode(settings.value(u'db password').toString())),
+                urlquote(unicode(settings.value(u'db hostname').toString())),
+                urlquote(unicode(settings.value(u'db database').toString())))
         else:
             self.db_url = u'%s://%s:%s@%s/%s' % (db_type,
                 urlquote(unicode(settings.value(u'db username').toString())),