1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL/MySQL: Fix retrieving a datetime for libmysql >= 8.0.27

Browse Source 
Somewhere between libmysql 8.0.18 and 8.0.27, the MYSQL_TIME structure
gained an additional member which increased the struct size by 4 bytes.
This makes an internal check for the correct size of the structi go fail.
Since it can now happen that the plugin is linked against a new libmysql
and used with an old and the other way round, duplicate the old
MYSQL_TIME struct to use this in our code

Fixes: QTBUG-110967
Change-Id: I5bc631179a0a1be47a5966954e757f27a72f1592
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit c67cc6d5706fa732ee78e286e0142f97f5b9d61f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2023-02-08 19:06:46 +01:00 committed by Qt Cherry-pick Bot
parent 1988f3c685
commit 598be12d4a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,17 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
// by redefining it we can regain source compatibility. // by redefining it we can regain source compatibility.
using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr)); using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
// this is a copy of the old MYSQL_TIME before an additional integer was added in
// 8.0.27.0. This kills the sanity check during retrieving this struct from mysql
// when another libmysql version is used during runtime than during compile time
struct QT_MYSQL_TIME
{
unsigned int year, month, day, hour, minute, second;
unsigned long second_part; /**< microseconds */
my_bool neg;
enum enum_mysql_timestamp_type time_type;
};
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;
@ -330,7 +341,7 @@ bool QMYSQLResultPrivate::bindInValues()
bind->buffer_length = f.bufLength = 0; bind->buffer_length = f.bufLength = 0;
hasBlobs = true; hasBlobs = true;
} else if (qIsTimeOrDate(fieldInfo->type)) { } else if (qIsTimeOrDate(fieldInfo->type)) {
bind->buffer_length = f.bufLength = sizeof(MYSQL_TIME); bind->buffer_length = f.bufLength = sizeof(QT_MYSQL_TIME);
} else if (qIsInteger(f.type.id())) { } else if (qIsInteger(f.type.id())) {
bind->buffer_length = f.bufLength = 8; bind->buffer_length = f.bufLength = 8;
} else { } else {
@ -534,8 +545,8 @@ QVariant QMYSQLResult::data(int field)
else if (f.type.id() == QMetaType::Char) else if (f.type.id() == QMetaType::Char)
return variant.toInt(); return variant.toInt();
return variant; return variant;
} else if (qIsTimeOrDate(f.myField->type) && f.bufLength == sizeof(MYSQL_TIME)) { } else if (qIsTimeOrDate(f.myField->type) && f.bufLength >= sizeof(QT_MYSQL_TIME)) {
auto t = reinterpret_cast<const MYSQL_TIME *>(f.outField); auto t = reinterpret_cast<const QT_MYSQL_TIME *>(f.outField);
QDate date; QDate date;
QTime time; QTime time;
if (f.type.id() != QMetaType::QTime) if (f.type.id() != QMetaType::QTime)
@ -795,13 +806,12 @@ void QMYSQLResult::virtual_hook(int id, void *data)
QSqlResult::virtual_hook(id, data); QSqlResult::virtual_hook(id, data);
} }
static MYSQL_TIME *toMySqlDate(QDate date, QTime time, int type) static QT_MYSQL_TIME *toMySqlDate(QDate date, QTime time, int type)
{ {
Q_ASSERT(type == QMetaType::QTime || type == QMetaType::QDate Q_ASSERT(type == QMetaType::QTime || type == QMetaType::QDate
|| type == QMetaType::QDateTime); || type == QMetaType::QDateTime);
MYSQL_TIME *myTime = new MYSQL_TIME; auto myTime = new QT_MYSQL_TIME{};
memset(myTime, 0, sizeof(MYSQL_TIME));
if (type == QMetaType::QTime || type == QMetaType::QDateTime) { if (type == QMetaType::QTime || type == QMetaType::QDateTime) {
myTime->hour = time.hour(); myTime->hour = time.hour();
@ -870,7 +880,7 @@ bool QMYSQLResult::exec()
return false; return false;
int r = 0; int r = 0;
QList<MYSQL_TIME *> timeVector; QList<QT_MYSQL_TIME *> timeVector;
QList<QByteArray> stringVector; QList<QByteArray> stringVector;
QList<my_bool> nullVector; QList<my_bool> nullVector;
@ -908,7 +918,7 @@ bool QMYSQLResult::exec()
case QMetaType::QTime: case QMetaType::QTime:
case QMetaType::QDate: case QMetaType::QDate:
case QMetaType::QDateTime: { case QMetaType::QDateTime: {
MYSQL_TIME *myTime = toMySqlDate(val.toDate(), val.toTime(), val.userType()); QT_MYSQL_TIME *myTime = toMySqlDate(val.toDate(), val.toTime(), val.userType());
timeVector.append(myTime); timeVector.append(myTime);
currBind->buffer = myTime; currBind->buffer = myTime;
@ -928,7 +938,7 @@ bool QMYSQLResult::exec()
default: default:
break; break;
} }
currBind->buffer_length = sizeof(MYSQL_TIME); currBind->buffer_length = sizeof(QT_MYSQL_TIME);
currBind->length = 0; currBind->length = 0;
break; } break; }
case QMetaType::UInt: case QMetaType::UInt: