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:
  Raoul Snyman (raoul-snyman)
  Jonathan Corwin (j-corwin)
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/94944

Fixed bug 941692
-- 
https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94944
Your team OpenLP Core is subscribed to branch 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-28 11:34:23 +0000
@@ -199,6 +199,10 @@
                 urlquote(unicode(settings.value(u'db password').toString())),
                 urlquote(unicode(settings.value(u'db hostname').toString())),
                 urlquote(unicode(settings.value(u'db database').toString())))
+            if db_type == u'mysql':
+                db_encoding = unicode(
+                    settings.value(u'db encoding', QtCore.QVariant(u'utf8')).toString())
+                self.db_url += u'?charset=%s' % (urlquote(db_encoding))
         settings.endGroup()
         if upgrade_mod:
             db_ver, up_ver = upgrade_db(self.db_url, upgrade_mod)