diff options
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r-- | src/plugins/sqldrivers/db2/qsql_db2.cpp | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 12 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 8 | ||||
-rw-r--r-- | src/plugins/sqldrivers/oci/qsql_oci.cpp | 6 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 24 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 2 |
6 files changed, 28 insertions, 28 deletions
diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp index 0e1ff6f2fc..e819d0ea86 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2.cpp +++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp @@ -992,7 +992,7 @@ bool QDB2Result::fetchFirst() SQL_FETCH_FIRST, 0); if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) { - if(r!= SQL_NO_DATA) + if (r!= SQL_NO_DATA) setLastError(qMakeError(QCoreApplication::translate("QDB2Result", "Unable to fetch first"), QSqlError::StatementError, d)); return false; @@ -1735,7 +1735,7 @@ QVariant QDB2Driver::handle() const QString QDB2Driver::escapeIdentifier(const QString &identifier, IdentifierType) const { QString res = identifier; - if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { + if (!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { res.replace(QLatin1Char('"'), QLatin1String("\"\"")); res.prepend(QLatin1Char('"')).append(QLatin1Char('"')); res.replace(QLatin1Char('.'), QLatin1String("\".\"")); diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index b61c41735b..82ea0919a5 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -80,7 +80,7 @@ static bool getIBaseError(QString& msg, const ISC_STATUS* status, ISC_LONG &sqlc sqlcode = isc_sqlcode(status); char buf[512]; while(fb_interpret(buf, 512, &status)) { - if(!msg.isEmpty()) + if (!msg.isEmpty()) msg += QLatin1String(" - "); msg += QString::fromUtf8(buf); } @@ -1358,7 +1358,7 @@ QSqlRecord QIBaseResult::record() const f.setLength(v.sqllen); f.setPrecision(qAbs(v.sqlscale)); f.setRequiredStatus((v.sqltype & 1) == 0 ? QSqlField::Required : QSqlField::Optional); - if(v.sqlscale < 0) { + if (v.sqlscale < 0) { QSqlQuery q(driver()->createResult()); q.setForwardOnly(true); q.exec(QLatin1String("select b.RDB$FIELD_PRECISION, b.RDB$FIELD_SCALE, b.RDB$FIELD_LENGTH, a.RDB$NULL_FLAG " @@ -1366,8 +1366,8 @@ QSqlRecord QIBaseResult::record() const "WHERE b.RDB$FIELD_NAME = a.RDB$FIELD_SOURCE " "AND a.RDB$RELATION_NAME = '") + QString::fromLatin1(v.relname, v.relname_length) + QLatin1String("' " "AND a.RDB$FIELD_NAME = '") + QString::fromLatin1(v.sqlname, v.sqlname_length) + QLatin1String("' ")); - if(q.first()) { - if(v.sqlscale < 0) { + if (q.first()) { + if (v.sqlscale < 0) { f.setLength(q.value(0).toInt()); f.setPrecision(qAbs(q.value(1).toInt())); } else { @@ -1642,7 +1642,7 @@ QSqlRecord QIBaseDriver::record(const QString& tablename) const int type = q.value(1).toInt(); bool hasScale = q.value(3).toInt() < 0; QSqlField f(q.value(0).toString().simplified(), qIBaseTypeName(type, hasScale), tablename); - if(hasScale) { + if (hasScale) { f.setLength(q.value(4).toInt()); f.setPrecision(qAbs(q.value(3).toInt())); } else { @@ -1883,7 +1883,7 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer) QString QIBaseDriver::escapeIdentifier(const QString &identifier, IdentifierType) const { QString res = identifier; - if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { + if (!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) { res.replace(QLatin1Char('"'), QLatin1String("\"\"")); res.prepend(QLatin1Char('"')).append(QLatin1Char('"')); res.replace(QLatin1Char('.'), QLatin1String("\".\"")); diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 733e949a98..04a2df9ac5 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -379,7 +379,7 @@ QMYSQLResult::~QMYSQLResult() QVariant QMYSQLResult::handle() const { Q_D(const QMYSQLResult); - if(d->preparedQuery) + if (d->preparedQuery) return d->meta ? QVariant::fromValue(d->meta) : QVariant::fromValue(d->stmt); else return QVariant::fromValue(d->result); @@ -600,7 +600,7 @@ QVariant QMYSQLResult::data(int field) ok = true; break; } - if(ok) + if (ok) return v; return QVariant(); } @@ -1371,7 +1371,7 @@ QSqlRecord QMYSQLDriver::record(const QString& tablename) const { Q_D(const QMYSQLDriver); QString table=tablename; - if(isIdentifierEscaped(table, QSqlDriver::TableName)) + if (isIdentifierEscaped(table, QSqlDriver::TableName)) table = stripDelimiters(table, QSqlDriver::TableName); QSqlRecord info; @@ -1481,7 +1481,7 @@ QString QMYSQLDriver::formatValue(const QSqlField &field, bool trimStrings) cons QString QMYSQLDriver::escapeIdentifier(const QString &identifier, IdentifierType) const { QString res = identifier; - if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('`')) && !identifier.endsWith(QLatin1Char('`')) ) { + if (!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('`')) && !identifier.endsWith(QLatin1Char('`')) ) { res.prepend(QLatin1Char('`')).append(QLatin1Char('`')); res.replace(QLatin1Char('.'), QLatin1String("`.`")); } diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 28b419e6a1..9659427c7c 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -1432,7 +1432,7 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVariantList &boundValues, bool a col.bindAs = SQLT_STR; for (uint j = 0; j < col.recordCount; ++j) { uint len; - if(d->isOutValue(i)) + if (d->isOutValue(i)) len = boundValues.at(i).toList().at(j).toString().capacity() + 1; else len = boundValues.at(i).toList().at(j).toString().length() + 1; @@ -1807,7 +1807,7 @@ void QOCICols::getValues(QVariantList &v, int index) qint64 qll = 0; int r = OCINumberToInt(d->err, reinterpret_cast<OCINumber *>(fld.data), sizeof(qint64), OCI_NUMBER_SIGNED, &qll); - if(r == OCI_SUCCESS) + if (r == OCI_SUCCESS) v[index + i] = qll; else v[index + i] = QVariant(); @@ -2762,7 +2762,7 @@ QVariant QOCIDriver::handle() const QString QOCIDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const { QString res = identifier; - if(!identifier.isEmpty() && !isIdentifierEscaped(identifier, type)) { + if (!identifier.isEmpty() && !isIdentifierEscaped(identifier, type)) { res.replace(QLatin1Char('"'), QLatin1String("\"\"")); res.prepend(QLatin1Char('"')).append(QLatin1Char('"')); res.replace(QLatin1Char('.'), QLatin1String("\".\"")); diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 27766c6a95..dd6eaab9cf 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -74,7 +74,7 @@ inline static QString fromSQLTCHAR(const QVarLengthArray<SQLTCHAR>& input, qsize // Remove any trailing \0 as some drivers misguidedly append one int realsize = qMin(size, input.size()); - if(realsize > 0 && input[realsize-1] == 0) + if (realsize > 0 && input[realsize-1] == 0) realsize--; switch(sizeof(SQLTCHAR)) { case 1: @@ -261,8 +261,8 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode if (nativeCode) *nativeCode = nativeCode_; const QString tmpstore = fromSQLTCHAR(description_, msgLen); - if(result != tmpstore) { - if(!result.isEmpty()) + if (result != tmpstore) { + if (!result.isEmpty()) result += QLatin1Char(' '); result += tmpstore; } @@ -414,7 +414,7 @@ static QString qGetStringData(SQLHANDLE hStmt, int column, int colSize, bool uni } else { colSize++; // make sure there is room for more than the 0 termination } - if(unicode) { + if (unicode) { r = SQLGetData(hStmt, column+1, SQL_C_TCHAR, @@ -603,7 +603,7 @@ static QVariant qGetDoubleData(SQLHANDLE hStmt, int column) if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) { return QVariant(); } - if(lengthIndicator == SQL_NULL_DATA) + if (lengthIndicator == SQL_NULL_DATA) return QVariant(QMetaType::fromType<double>()); return (double) dblbuf; @@ -1033,7 +1033,7 @@ bool QODBCResult::reset (const QString& query) SQLULEN isScrollable = 0; r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, 0); - if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) + if (r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) setForwardOnly(isScrollable == SQL_NONSCROLLABLE); SQLSMALLINT count = 0; @@ -1667,7 +1667,7 @@ bool QODBCResult::exec() SQLULEN isScrollable = 0; r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, 0); - if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) + if (r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) setForwardOnly(isScrollable == SQL_NONSCROLLABLE); SQLSMALLINT count = 0; @@ -2017,7 +2017,7 @@ void QODBCDriver::cleanup() Q_D(QODBCDriver); SQLRETURN r; - if(d->hDbc) { + if (d->hDbc) { // Open statements/descriptors handles are automatically cleaned up by SQLDisconnect if (isOpen()) { r = SQLDisconnect(d->hDbc); @@ -2084,12 +2084,12 @@ void QODBCDriverPrivate::checkUnicode() &hStmt); r = SQLExecDirect(hStmt, toSQLTCHAR(QLatin1String("select 'test'")).data(), SQL_NTS); - if(r == SQL_SUCCESS) { + if (r == SQL_SUCCESS) { r = SQLFetch(hStmt); - if(r == SQL_SUCCESS) { + if (r == SQL_SUCCESS) { QVarLengthArray<SQLWCHAR> buffer(10); r = SQLGetData(hStmt, 1, SQL_C_WCHAR, buffer.data(), buffer.size() * sizeof(SQLWCHAR), NULL); - if(r == SQL_SUCCESS && fromSQLTCHAR(buffer) == QLatin1String("test")) { + if (r == SQL_SUCCESS && fromSQLTCHAR(buffer) == QLatin1String("test")) { unicode = true; } } @@ -2626,7 +2626,7 @@ QString QODBCDriver::escapeIdentifier(const QString &identifier, IdentifierType) Q_D(const QODBCDriver); QChar quote = const_cast<QODBCDriverPrivate*>(d)->quoteChar(); QString res = identifier; - if(!identifier.isEmpty() && !identifier.startsWith(quote) && !identifier.endsWith(quote) ) { + if (!identifier.isEmpty() && !identifier.startsWith(quote) && !identifier.endsWith(quote) ) { res.replace(quote, QString(quote)+QString(quote)); res.prepend(quote).append(quote); res.replace(QLatin1Char('.'), QString(quote)+QLatin1Char('.')+QString(quote)); diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index d6a0f319f9..4f70728d73 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -262,7 +262,7 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i } skipRow = initialFetch; - if(initialFetch) { + if (initialFetch) { firstRow.clear(); firstRow.resize(sqlite3_column_count(stmt)); } |