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

SQL/MySQL: misc cleanup

Browse Source 
Cleanup the code a little bit and use qsizetype on some obvious places.

Change-Id: Ib9e5ec79a39c45c9fab7e21dbda70ed728025191
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Christian Ehrlicher 2022-10-15 20:45:44 +02:00
parent 3f86c62a81
commit 2b35b89803
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,10 +171,10 @@ public:
bool preparedQuery = false; bool preparedQuery = false;
}; };
static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, static QSqlError qMakeError(const QString &err, QSqlError::ErrorType type,
const QMYSQLDriverPrivate* p) const QMYSQLDriverPrivate *p)
{ {
const char *cerr = p->mysql ? mysql_error(p->mysql) : 0; const char *cerr = p->mysql ? mysql_error(p->mysql) : nullptr;
return QSqlError("QMYSQL: "_L1 + err, return QSqlError("QMYSQL: "_L1 + err,
QString::fromUtf8(cerr), QString::fromUtf8(cerr),
type, QString::number(mysql_errno(p->mysql))); type, QString::number(mysql_errno(p->mysql)));
@ -252,8 +252,8 @@ static QSqlField qToField(MYSQL_FIELD *field)
return f; return f;
} }
static QSqlError qMakeStmtError(const QString& err, QSqlError::ErrorType type, static QSqlError qMakeStmtError(const QString &err, QSqlError::ErrorType type,
MYSQL_STMT* stmt) MYSQL_STMT *stmt)
{ {
const char *cerr = mysql_stmt_error(stmt); const char *cerr = mysql_stmt_error(stmt);
return QSqlError("QMYSQL: "_L1 + err, return QSqlError("QMYSQL: "_L1 + err,
@ -391,9 +391,8 @@ void QMYSQLResult::cleanup()
d->meta = 0; d->meta = 0;
} }
int i; for (const QMYSQLResultPrivate::QMyField &f : std::as_const(d->fields))
for (i = 0; i < d->fields.size(); ++i) delete[] f.outField;
delete[] d->fields[i].outField;
if (d->outBinds) { if (d->outBinds) {
delete[] d->outBinds; delete[] d->outBinds;
@ -483,12 +482,7 @@ bool QMYSQLResult::fetchLast()
return success; return success;
} }
my_ulonglong numRows; my_ulonglong numRows = d->preparedQuery ? mysql_stmt_num_rows(d->stmt) : mysql_num_rows(d->result);
if (d->preparedQuery) {
numRows = mysql_stmt_num_rows(d->stmt);
} else {
numRows = mysql_num_rows(d->result);
}
if (at() == int(numRows)) if (at() == int(numRows))
return true; return true;
if (!numRows) if (!numRows)
@ -729,7 +723,7 @@ QSqlRecord QMYSQLResult::record() const
if (!mysql_errno(d->drv_d_func()->mysql)) { if (!mysql_errno(d->drv_d_func()->mysql)) {
mysql_field_seek(res, 0); mysql_field_seek(res, 0);
MYSQL_FIELD* field = mysql_fetch_field(res); MYSQL_FIELD* field = mysql_fetch_field(res);
while(field) { while (field) {
info.append(qToField(field)); info.append(qToField(field));
field = mysql_fetch_field(res); field = mysql_fetch_field(res);
} }
@ -752,8 +746,8 @@ bool QMYSQLResult::nextResult()
d->result = 0; d->result = 0;
setSelect(false); setSelect(false);
for (int i = 0; i < d->fields.size(); ++i) for (const QMYSQLResultPrivate::QMyField &f : std::as_const(d->fields))
delete[] d->fields[i].outField; delete[] f.outField;
d->fields.clear(); d->fields.clear();
int status = mysql_next_result(d->drv_d_func()->mysql); int status = mysql_next_result(d->drv_d_func()->mysql);
@ -766,7 +760,7 @@ bool QMYSQLResult::nextResult()
} }
d->result = mysql_store_result(d->drv_d_func()->mysql); d->result = mysql_store_result(d->drv_d_func()->mysql);
int numFields = mysql_field_count(d->drv_d_func()->mysql); unsigned int numFields = mysql_field_count(d->drv_d_func()->mysql);
if (!d->result && numFields > 0) { if (!d->result && numFields > 0) {
setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to store next result"), setLastError(qMakeError(QCoreApplication::translate("QMYSQLResult", "Unable to store next result"),
QSqlError::StatementError, d->drv_d_func())); QSqlError::StatementError, d->drv_d_func()));
@ -778,8 +772,8 @@ bool QMYSQLResult::nextResult()
d->rowsAffected = mysql_affected_rows(d->drv_d_func()->mysql); d->rowsAffected = mysql_affected_rows(d->drv_d_func()->mysql);
if (isSelect()) { if (isSelect()) {
for (int i = 0; i < numFields; i++) { for (unsigned int i = 0; i < numFields; i++) {
MYSQL_FIELD* field = mysql_fetch_field_direct(d->result, i); MYSQL_FIELD *field = mysql_fetch_field_direct(d->result, i);
d->fields[i].type = qDecodeMYSQLType(field->type, field->flags); d->fields[i].type = qDecodeMYSQLType(field->type, field->flags);
} }
} }
@ -885,7 +879,7 @@ bool QMYSQLResult::exec()
mysql_stmt_param_count(d->stmt) == (uint)values.size()) { mysql_stmt_param_count(d->stmt) == (uint)values.size()) {
nullVector.resize(values.size()); nullVector.resize(values.size());
for (int i = 0; i < values.size(); ++i) { for (qsizetype i = 0; i < values.size(); ++i) {
const QVariant &val = boundValues().at(i); const QVariant &val = boundValues().at(i);
void *data = const_cast<void *>(val.constData()); void *data = const_cast<void *>(val.constData());
@ -1352,7 +1346,7 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const
return tl; return tl;
} }
QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const QSqlIndex QMYSQLDriver::primaryIndex(const QString &tablename) const
{ {
QSqlIndex idx; QSqlIndex idx;
if (!isOpen()) if (!isOpen())
@ -1373,22 +1367,19 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const
return idx; return idx;
} }
QSqlRecord QMYSQLDriver::record(const QString& tablename) const QSqlRecord QMYSQLDriver::record(const QString &tablename) const
{ {
Q_D(const QMYSQLDriver); Q_D(const QMYSQLDriver);
QString table=tablename; const QString table = stripDelimiters(tablename, QSqlDriver::TableName);
if (isIdentifierEscaped(table, QSqlDriver::TableName))
table = stripDelimiters(table, QSqlDriver::TableName);
QSqlRecord info; QSqlRecord info;
if (!isOpen()) if (!isOpen())
return info; return info;
MYSQL_RES* r = mysql_list_fields(d->mysql, table.toUtf8().constData(), 0); MYSQL_RES *r = mysql_list_fields(d->mysql, table.toUtf8().constData(), nullptr);
if (!r) { if (!r)
return info; return info;
}
MYSQL_FIELD* field;
MYSQL_FIELD *field;
while ((field = mysql_fetch_field(r))) while ((field = mysql_fetch_field(r)))
info.append(qToField(field)); info.append(qToField(field));
mysql_free_result(r); mysql_free_result(r);
@ -1499,9 +1490,9 @@ QString QMYSQLDriver::formatValue(const QSqlField &field, bool trimStrings) cons
QString QMYSQLDriver::escapeIdentifier(const QString &identifier, IdentifierType) const QString QMYSQLDriver::escapeIdentifier(const QString &identifier, IdentifierType) const
{ {
QString res = identifier; QString res = identifier;
if (!identifier.isEmpty() && !identifier.startsWith(u'`') && !identifier.endsWith(u'`') ) { if (!identifier.isEmpty() && !identifier.startsWith(u'`') && !identifier.endsWith(u'`')) {
res.prepend(u'`').append(u'`');
res.replace(u'.', "`.`"_L1); res.replace(u'.', "`.`"_L1);
res = u'`' + res + u'`';
} }
return res; return res;
} }