From 779e5faf1d780827e61b9fbe6a607e55a804ae5e Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Mon, 27 Jan 2025 08:25:55 +0100 Subject: [PATCH] SQL/PSQL: slight improvement in code added a details about code paths that cannot happen and added constexpr Fixes: QTBUG-132303 Change-Id: I98340c5a1f275c00aafb3294cf8e5e8368126b76 Reviewed-by: Christian Ehrlicher (cherry picked from commit e574cda7fc3f6be5a81489d8d9cdb859625d4e88) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/sqldrivers/psql/qsql_psql.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index 63c7d226612..79048863722 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -1455,7 +1455,10 @@ QSqlRecord QPSQLDriver::record(const QString &tablename) const template inline QString autoQuoteResult(QAnyStringView str) { - return forPreparedStatement ? str.toString() : (u'\'' + str.toString() + u'\''); + if constexpr (forPreparedStatement) + return str.toString(); + else + return u'\'' + str.toString() + u'\''; } template @@ -1505,8 +1508,8 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const break; } case QMetaType::QString: - if (forPreparedStatement) { - r = field.value().toString(); + if constexpr (forPreparedStatement) { + r = field.value().toString(); // there is no code path where trimStrings can be true here } else { r = QSqlDriver::formatValue(field, trimStrings); if (d->hasBackslashEscape)