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

SQL/OCI: fix compilation

Browse Source 
Fix compilation error introduced with
917b4d3802f3c2102021610cbf977403a3d4c21a and add a missing override

Fixes: QTBUG-107544
Change-Id: I53571a0a113dc0f1e65f8773e66c02c1764739ee
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
(cherry picked from commit c3dccfef22267c2f78438973a39bc91260d96582)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2022-10-13 20:11:04 +02:00 committed by Qt Cherry-pick Bot
parent 3422818d90
commit 11dfb44144
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/sqldrivers/oci/main.cpp
View File

@ -17,7 +17,7 @@ class QOCIDriverPlugin : public QSqlDriverPlugin
public: public:
QOCIDriverPlugin(); QOCIDriverPlugin();
QSqlDriver* create(const QString &); QSqlDriver* create(const QString &) override;
}; };
QOCIDriverPlugin::QOCIDriverPlugin() QOCIDriverPlugin::QOCIDriverPlugin()

3
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -426,6 +426,7 @@ int QOCIResultPrivate::bindValue(OCIStmt *sql, OCIBind **hbnd, OCIError *err, in
break; break;
} }
} // fall through for OUT values } // fall through for OUT values
Q_FALLTHROUGH();
default: { default: {
if (val.typeId() >= QMetaType::User) { if (val.typeId() >= QMetaType::User) {
if (val.canConvert<QOCIRowIdPointer>() && !isOutValue(pos)) { if (val.canConvert<QOCIRowIdPointer>() && !isOutValue(pos)) {
@ -2434,7 +2435,7 @@ static QString make_where_clause(const QString &user, Expression e)
"WMSYS", "WMSYS",
}; };
static const char joinC[][4] = { "or" , "and" }; static const char joinC[][4] = { "or" , "and" };
static constexpr QLatin1Char bang[] = { u' ', u'!' }; static constexpr char16_t bang[] = { u' ', u'!' };
const QLatin1StringView join(joinC[e]); const QLatin1StringView join(joinC[e]);