AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MySQL: properly fix setting the character set

Browse Source 
Commit e4bd73dc54 moved the
mysql_set_character_set() call above the mysql_real_connect() but that
doesn't actually work, as there's no connection to send the "SET NAMES"
statement on.

So do it in two steps: first, by setting the charset in the MYSQL
structure, then by asking the server to match.

Pick-to: 6.2
Task-number: QTBUG-55444
Change-Id: I4a40ccbd3321467a8429fffd1699bd829f342124
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Thiago Macieira 2021-08-09 13:31:48 -07:00
parent aa93b4835a
commit 472520afb9
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -1235,9 +1235,22 @@ bool QMYSQLDriver::open(const QString& db,
}
// try utf8 with non BMP first, utf8 (BMP only) if that fails
if (mysql_set_character_set(d->mysql, "utf8mb4"))
if (mysql_set_character_set(d->mysql, "utf8"))
qWarning() << "MySQL: Unable to set the client character set to utf8.";
static const char wanted_charsets[][8] = { "utf8mb4", "utf8" };
#ifdef MARIADB_VERSION_ID
MARIADB_CHARSET_INFO *cs = nullptr;
for (const char *p : wanted_charsets) {
cs = mariadb_get_charset_by_name(p);
if (cs) {
d->mysql->charset = cs;
break;
}
}
#else
// dummy
struct {
const char *csname;
} *cs = nullptr;
#endif
if (!sslKey.isNull() || !sslCert.isNull() || !sslCA.isNull() ||
!sslCAPath.isNull() || !sslCipher.isNull()) {
@ -1265,6 +1278,21 @@ bool QMYSQLDriver::open(const QString& db,
unixSocket.isNull() ? nullptr : unixSocket.toUtf8().constData(),
optionFlags);
// now ask the server to match the charset we selected
if (!cs || mysql_set_character_set(d->mysql, cs->csname)) {
bool ok = false;
for (const char *p : wanted_charsets) {
if (mysql_set_character_set(d->mysql, p)) {
ok = true;
break;
}
}
if (!ok)
qWarning("MySQL: Unable to set the client character set to utf8 (\"%s\"). Using '%s' instead.",
mysql_error(d->mysql),
mysql_character_set_name(d->mysql));
}
if (mysql == d->mysql) {
if (!db.isEmpty() && mysql_select_db(d->mysql, db.toUtf8().constData())) {
setLastError(qMakeError(tr("Unable to open database '%1'").arg(db), QSqlError::ConnectionError, d));