mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-11-30 17:20:32 +01:00
2018-07-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused the incorrect character set to be used when opening a DB connection. * Added a 'db_charset_test' test harness.
This commit is contained in:
10
lib/rddb.cpp
10
lib/rddb.cpp
@@ -63,14 +63,16 @@ QSqlDatabase *RDInitDb (unsigned *schema,QString *error)
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
QString sql=QString("set charset '")+cf->mysqlCharset()+"'";
|
||||
QSqlQuery *q=new QSqlQuery(sql);
|
||||
delete q;
|
||||
|
||||
if (firsttime){
|
||||
new RDDbHeartbeat(cf->mysqlHeartbeatInterval());
|
||||
firsttime = false;
|
||||
}
|
||||
// QSqlQuery *q=new QSqlQuery("set character_set_results='utf8'");
|
||||
// delete q;
|
||||
|
||||
QSqlQuery *q=new QSqlQuery("select DB from VERSION");
|
||||
q=new QSqlQuery("select DB from VERSION");
|
||||
if(q->first()) {
|
||||
*schema=q->value(0).toUInt();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user