1 files changed, 81 insertions, 38 deletions

diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index f93ca168d1..63f782fe22 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -7,6 +7,7 @@
 
 #include "qatomic.h"
 #include "qdebug.h"
+#include "qloggingcategory.h"
 #include "qsqlrecord.h"
 #include "qsqlresult.h"
 #include "qsqldriver.h"
@@ -19,6 +20,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_STATIC_LOGGING_CATEGORY(lcSqlQuery, "qt.sql.qsqlquery")
+
 class QSqlQueryPrivate
 {
 public:
@@ -333,13 +336,12 @@ bool QSqlQuery::isNull(int field) const
 
     This overload is less efficient than \l{QSqlQuery::}{isNull()}
 */
-
-bool QSqlQuery::isNull(const QString &name) const
+bool QSqlQuery::isNull(QAnyStringView name) const
 {
     qsizetype index = d->sqlResult->record().indexOf(name);
     if (index > -1)
         return isNull(index);
-    qWarning("QSqlQuery::isNull: unknown field name '%s'", qPrintable(name));
+    qCWarning(lcSqlQuery, "QSqlQuery::isNull: unknown field name '%ls'", qUtf16Printable(name.toString()));
     return true;
 }
 
@@ -375,7 +377,7 @@ bool QSqlQuery::exec(const QString& query)
     t.start();
 #endif
     if (!driver()) {
-        qWarning("QSqlQuery::exec: called before driver has been set up");
+        qCWarning(lcSqlQuery, "QSqlQuery::exec: called before driver has been set up");
         return false;
     }
     if (d->ref.loadRelaxed() != 1) {
@@ -392,19 +394,20 @@ bool QSqlQuery::exec(const QString& query)
     }
     d->sqlResult->setQuery(query.trimmed());
     if (!driver()->isOpen() || driver()->isOpenError()) {
-        qWarning("QSqlQuery::exec: database not open");
+        qCWarning(lcSqlQuery, "QSqlQuery::exec: database not open");
         return false;
     }
     if (query.isEmpty()) {
-        qWarning("QSqlQuery::exec: empty query");
+        qCWarning(lcSqlQuery, "QSqlQuery::exec: empty query");
         return false;
     }
 
     bool retval = d->sqlResult->reset(query);
 #ifdef QT_DEBUG_SQL
-    qDebug().nospace() << "Executed query (" << t.elapsed() << "ms, " << d->sqlResult->size()
-                       << " results, " << d->sqlResult->numRowsAffected()
-                       << " affected): " << d->sqlResult->lastQuery();
+    qCDebug(lcSqlQuery()).nospace() << "Executed query (" << t.elapsed() << "ms, "
+                                    << d->sqlResult->size()
+                                    << " results, " << d->sqlResult->numRowsAffected()
+                                    << " affected): " << d->sqlResult->lastQuery();
 #endif
     return retval;
 }
@@ -432,7 +435,7 @@ QVariant QSqlQuery::value(int index) const
 {
     if (isActive() && isValid() && (index > -1))
         return d->sqlResult->data(index);
-    qWarning("QSqlQuery::value: not positioned on a valid record");
+    qCWarning(lcSqlQuery, "QSqlQuery::value: not positioned on a valid record");
     return QVariant();
 }
 
@@ -444,13 +447,12 @@ QVariant QSqlQuery::value(int index) const
 
     This overload is less efficient than \l{QSqlQuery::}{value()}
 */
-
-QVariant QSqlQuery::value(const QString& name) const
+QVariant QSqlQuery::value(QAnyStringView name) const
 {
     qsizetype index = d->sqlResult->record().indexOf(name);
     if (index > -1)
         return value(index);
-    qWarning("QSqlQuery::value: unknown field name '%s'", qPrintable(name));
+    qCWarning(lcSqlQuery, "QSqlQuery::value: unknown field name '%ls'", qUtf16Printable(name.toString()));
     return QVariant();
 }
 
@@ -596,7 +598,7 @@ bool QSqlQuery::seek(int index, bool relative)
     }
     // let drivers optimize
     if (isForwardOnly() && actualIdx < at()) {
-        qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query");
+        qCWarning(lcSqlQuery, "QSqlQuery::seek: cannot seek backwards in a forward only query");
         return false;
     }
     if (actualIdx == (at() + 1) && at() != QSql::BeforeFirstRow) {
@@ -702,7 +704,7 @@ bool QSqlQuery::previous()
     if (!isSelect() || !isActive())
         return false;
     if (isForwardOnly()) {
-        qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query");
+        qCWarning(lcSqlQuery, "QSqlQuery::seek: cannot seek backwards in a forward only query");
         return false;
     }
 
@@ -735,7 +737,7 @@ bool QSqlQuery::first()
     if (!isSelect() || !isActive())
         return false;
     if (isForwardOnly() && at() > QSql::BeforeFirstRow) {
-        qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query");
+        qCWarning(lcSqlQuery, "QSqlQuery::seek: cannot seek backwards in a forward only query");
         return false;
     }
     return d->sqlResult->fetchFirst();
@@ -850,10 +852,9 @@ bool QSqlQuery::isSelect() const
 }
 
 /*!
-  Returns \c true if you can only scroll forward through a result set;
-  otherwise returns \c false.
+  Returns \l forwardOnly.
 
-  \sa setForwardOnly(), next()
+  \sa forwardOnly, next(), seek()
 */
 bool QSqlQuery::isForwardOnly() const
 {
@@ -861,7 +862,10 @@ bool QSqlQuery::isForwardOnly() const
 }
 
 /*!
-  Sets forward only mode to \a forward. If \a forward is true, only
+  \property QSqlQuery::forwardOnly
+  \since 6.8
+
+  This property holds the forward only mode. If \a forward is true, only
   next() and seek() with positive values, are allowed for navigating
   the results.
 
@@ -890,7 +894,11 @@ bool QSqlQuery::isForwardOnly() const
   mode, do not execute any other SQL command on the same database
   connection. This will cause the query results to be lost.
 
-  \sa isForwardOnly(), next(), seek(), QSqlResult::setForwardOnly()
+  \sa next(), seek()
+*/
+/*!
+    Sets \l forwardOnly to \a forward.
+    \sa forwardOnly, next(), seek()
 */
 void QSqlQuery::setForwardOnly(bool forward)
 {
@@ -976,19 +984,19 @@ bool QSqlQuery::prepare(const QString& query)
         d->sqlResult->setNumericalPrecisionPolicy(d->sqlResult->numericalPrecisionPolicy());
     }
     if (!driver()) {
-        qWarning("QSqlQuery::prepare: no driver");
+        qCWarning(lcSqlQuery, "QSqlQuery::prepare: no driver");
         return false;
     }
     if (!driver()->isOpen() || driver()->isOpenError()) {
-        qWarning("QSqlQuery::prepare: database not open");
+        qCWarning(lcSqlQuery, "QSqlQuery::prepare: database not open");
         return false;
     }
     if (query.isEmpty()) {
-        qWarning("QSqlQuery::prepare: empty query");
+        qCWarning(lcSqlQuery, "QSqlQuery::prepare: empty query");
         return false;
     }
 #ifdef QT_DEBUG_SQL
-    qDebug("\n QSqlQuery::prepare: %s", query.toLocal8Bit().constData());
+    qCDebug(lcSqlQuery, "\n QSqlQuery::prepare: %ls", qUtf16Printable(query));
 #endif
     return d->sqlResult->savePrepare(query);
 }
@@ -1015,9 +1023,9 @@ bool QSqlQuery::exec()
 
     bool retval = d->sqlResult->exec();
 #ifdef QT_DEBUG_SQL
-    qDebug().nospace() << "Executed prepared query (" << t.elapsed() << "ms, "
-                       << d->sqlResult->size() << " results, " << d->sqlResult->numRowsAffected()
-                       << " affected): " << d->sqlResult->lastQuery();
+    qCDebug(lcSqlQuery).nospace() << "Executed prepared query (" << t.elapsed() << "ms, "
+                                  << d->sqlResult->size() << " results, " << d->sqlResult->numRowsAffected()
+                                  << " affected): " << d->sqlResult->lastQuery();
 #endif
     return retval;
 }
@@ -1029,8 +1037,6 @@ bool QSqlQuery::exec()
 */
 
 /*!
-    \since 4.2
-
   Executes a previously prepared SQL query in a batch. All the bound
   parameters have to be lists of variants. If the database doesn't
   support batch executions, the driver will simulate it using
@@ -1234,6 +1240,8 @@ QVariant QSqlQuery::lastInsertId() const
 }
 
 /*!
+  \property QSqlQuery::numericalPrecisionPolicy
+  \since 6.8
 
   Instruct the database driver to return numerical values with a
   precision specified by \a precisionPolicy.
@@ -1252,17 +1260,19 @@ QVariant QSqlQuery::lastInsertId() const
   active query. Call \l{exec()}{exec(QString)} or prepare() in order
   to activate the policy.
 
-  \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy()
+  \sa QSql::NumericalPrecisionPolicy, QSqlDriver::numericalPrecisionPolicy,
+  QSqlDatabase::numericalPrecisionPolicy
 */
+/*!
+    Sets \l numericalPrecisionPolicy to \a precisionPolicy.
+ */
 void QSqlQuery::setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy)
 {
     d->sqlResult->setNumericalPrecisionPolicy(precisionPolicy);
 }
 
 /*!
-  Returns the current precision policy.
-
-  \sa QSql::NumericalPrecisionPolicy, setNumericalPrecisionPolicy()
+    Returns the \l numericalPrecisionPolicy.
 */
 QSql::NumericalPrecisionPolicy QSqlQuery::numericalPrecisionPolicy() const
 {
@@ -1270,8 +1280,41 @@ QSql::NumericalPrecisionPolicy QSqlQuery::numericalPrecisionPolicy() const
 }
 
 /*!
-  \since 4.3.2
+  \property QSqlQuery::positionalBindingEnabled
+  \since 6.8
+  This property enables or disables the positional \l {Approaches to Binding Values}{binding}
+  for this query, depending on \a enable (default is \c true).
+  Disabling positional bindings is useful if the query itself contains a '?'
+  which must not be handled as a positional binding parameter but, for example,
+  as a JSON operator for a PostgreSQL database.
+
+  This property will have no effect when the database has native
+  support for positional bindings with question marks (see also
+  \l{QSqlDriver::PositionalPlaceholders}).
+*/
+
+/*!
+  Sets \l positionalBindingEnabled to \a enable.
+  \since 6.7
+  \sa positionalBindingEnabled
+*/
+void QSqlQuery::setPositionalBindingEnabled(bool enable)
+{
+    d->sqlResult->setPositionalBindingEnabled(enable);
+}
+
+/*!
+  Returns \l positionalBindingEnabled.
+  \since 6.7
+  \sa positionalBindingEnabled
+*/
+bool QSqlQuery::isPositionalBindingEnabled() const
+{
+    return d->sqlResult->isPositionalBindingEnabled();
+}
+
 
+/*!
   Instruct the database driver that no more data will be fetched from
   this query until it is re-executed. There is normally no need to
   call this function, but it may be helpful in order to free resources
@@ -1293,8 +1336,6 @@ void QSqlQuery::finish()
 }
 
 /*!
-  \since 4.4
-
   Discards the current result set and navigates to the next if available.
 
   Some databases are capable of returning multiple result sets for
@@ -1320,7 +1361,7 @@ void QSqlQuery::finish()
   databases may have restrictions on which statements are allowed to
   be used in a SQL batch.
 
-  \sa QSqlDriver::hasFeature(), setForwardOnly(), next(), isSelect(),
+  \sa QSqlDriver::hasFeature(), forwardOnly, next(), isSelect(),
       numRowsAffected(), isActive(), lastError()
 */
 bool QSqlQuery::nextResult()
@@ -1331,3 +1372,5 @@ bool QSqlQuery::nextResult()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsqlquery.cpp"