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

SQL/IBase: code cleanup part 2/5

Browse Source 
The lower bit of the sqltype is used to express NULL values and needs
therefore masked out. Do this before the acutal operations for better
readability/debugability.

Change-Id: I71ee97f4c38241ccc9804562e2826ce9b53567ba
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit fc4750bd753999e9a0787614ac8960e0506075dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2024-06-06 17:02:45 +02:00 committed by Qt Cherry-pick Bot
parent 1c423e57d3
commit fbbd62d90c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View File

@ -98,7 +98,8 @@ static void initDA(XSQLDA *sqlda)
{ {
for (int i = 0; i < sqlda->sqld; ++i) { for (int i = 0; i < sqlda->sqld; ++i) {
XSQLVAR &sqlvar = sqlda->sqlvar[i]; XSQLVAR &sqlvar = sqlda->sqlvar[i];
switch (sqlvar.sqltype & ~1) { const auto sqltype = (sqlvar.sqltype & ~1);
switch (sqltype) {
case SQL_INT64: case SQL_INT64:
case SQL_LONG: case SQL_LONG:
case SQL_SHORT: case SQL_SHORT:
@ -128,7 +129,7 @@ static void initDA(XSQLDA *sqlda)
default: default:
// not supported - do not bind. // not supported - do not bind.
sqlvar.sqldata = 0; sqlvar.sqldata = 0;
qCWarning(lcIbase, "initDA: unknown sqltype: %d", sqlvar.sqltype & ~1); qCWarning(lcIbase, "initDA: unknown sqltype: %d", sqltype);
break; break;
} }
if (sqlvar.sqltype & 1) { if (sqlvar.sqltype & 1) {
@ -1146,7 +1147,8 @@ bool QIBaseResult::exec()
<< ", which is not nullable."_L1; << ", which is not nullable."_L1;
} }
} }
switch(sqlvar.sqltype & ~1) { const auto sqltype = sqlvar.sqltype & ~1;
switch (sqltype) {
case SQL_INT64: case SQL_INT64:
setWithScale<qint64>(val, sqlvar.sqlscale, sqlvar.sqldata); setWithScale<qint64>(val, sqlvar.sqlscale, sqlvar.sqldata);
break; break;
@ -1188,7 +1190,7 @@ bool QIBaseResult::exec()
case SQL_VARYING: case SQL_VARYING:
case SQL_TEXT: case SQL_TEXT:
qFillBufferWithString(sqlvar.sqldata, val.toString(), sqlvar.sqllen, qFillBufferWithString(sqlvar.sqldata, val.toString(), sqlvar.sqllen,
(sqlvar.sqltype & ~1) == SQL_VARYING, false); sqltype == SQL_VARYING, false);
break; break;
case SQL_BLOB: case SQL_BLOB:
ok &= d->writeBlob(para, val.toByteArray()); ok &= d->writeBlob(para, val.toByteArray());
@ -1201,7 +1203,7 @@ bool QIBaseResult::exec()
break; break;
default: default:
qCWarning(lcIbase, "QIBaseResult::exec: Unknown datatype %d", qCWarning(lcIbase, "QIBaseResult::exec: Unknown datatype %d",
sqlvar.sqltype & ~1); sqltype);
break; break;
} }
} }
@ -1308,7 +1310,8 @@ bool QIBaseResult::gotoNext(QSqlCachedResult::ValueCache& row, int rowIdx)
char *buf = sqlvar.sqldata; char *buf = sqlvar.sqldata;
int size = sqlvar.sqllen; int size = sqlvar.sqllen;
Q_ASSERT(buf); Q_ASSERT(buf);
switch(sqlvar.sqltype & ~1) { const auto sqltype = sqlvar.sqltype & ~1;
switch (sqltype) {
case SQL_VARYING: case SQL_VARYING:
// pascal strings - a short with a length information followed by the data // pascal strings - a short with a length information followed by the data
row[idx] = QString::fromUtf8(buf + sizeof(short), *(short*)buf); row[idx] = QString::fromUtf8(buf + sizeof(short), *(short*)buf);
@ -1379,7 +1382,7 @@ bool QIBaseResult::gotoNext(QSqlCachedResult::ValueCache& row, int rowIdx)
#endif #endif
default: default:
// unknown type - don't even try to fetch // unknown type - don't even try to fetch
qCWarning(lcIbase, "gotoNext: unknown sqltype: %d", sqlvar.sqltype & ~1); qCWarning(lcIbase, "gotoNext: unknown sqltype: %d", sqltype);
row[idx] = QVariant(); row[idx] = QVariant();
break; break;
} }