From 999d856bc8569455c21850dc524a595e6b6f52b6 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 22 Dec 2021 15:09:23 +0100 Subject: Adapt SQL drivers to Qt 6 change of QVariant::isNull In Qt 5, QVariant::isNull returned true if either the variant didn't contain a value, or if the value was of a nullable type where the type's isNull member function returned true. In Qt 6, QVariant::isNull only returns true for variants that don't contain a value; if the value contained is e.g. a null-QString or QDateTime, then QVariant::isNull returns false. This change requires a follow up in the SQL drivers, which must still treat null-values the same as null-variants, lest they write data into the data base. Add a static helper to QSqlResultPrivate that implements isNull-checking of variants that contain a nullable type relevant for Sql, and add a test case to the QSqlQuery test that exercises that code. Pick-to: 6.2 6.3 Fixes: QTBUG-99408 Fixes: QTBUG-98471 Change-Id: I08b74a33aa3235c37d974f182da1f2bdcfd8217e Reviewed-by: Fabian Kosmale --- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/sqldrivers/odbc/qsql_odbc.cpp') diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 1b3a55d096..dbbf984fa9 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -1419,7 +1419,7 @@ bool QODBCResult::exec() values[i].detach(); const QVariant &val = values.at(i); SQLLEN *ind = &indicators[i]; - if (val.isNull()) + if (QSqlResultPrivate::isVariantNull(val)) *ind = SQL_NULL_DATA; switch (val.typeId()) { case QMetaType::QDate: { -- cgit v1.2.3