[oracle] Fix handling of type null variants

qgis · Feb 11, 2025 · b7223cf · b7223cf
1 parent 5fc13f9
commit b7223cf
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -1394,12 +1394,18 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
         QVariant value = attributevec.value( fieldId[i], QVariant() );
 
         QgsField fld = field( fieldId[i] );
-        if ( ( value.isNull() && mPrimaryKeyAttrs.contains( i ) && !defaultValues.at( i ).isEmpty() )
+        if ( ( QgsVariantUtils::isNull( value ) && mPrimaryKeyAttrs.contains( i ) && !defaultValues.at( i ).isEmpty() )
              || ( value.toString() == defaultValues[i] )
              || value.userType() == qMetaTypeId< QgsUnsetAttributeValue >() )
         {
           value = evaluateDefaultExpression( defaultValues[i], fld.type() );
         }
+        else if ( QgsVariantUtils::isNull( value ) )
+        {
+          // don't use typed null variants, always use invalid variants. Otherwise the connection
+          // may incorrectly try to coerce a null value to the variant type
+          value = QVariant();
+        }
         features->setAttribute( fieldId[i], value );
 
         QgsDebugMsgLevel( QStringLiteral( "addBindValue: %1" ).arg( value.toString() ), 4 );