Remove all primary keys when RegeneratePrimaryKey is set, not just th…

…ose for GPKG
qgis · Oct 15, 2020 · f0bee04 · f0bee04
1 parent db7b977
commit f0bee04
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/core/qgsvectorlayerutils.cpp b/src/core/qgsvectorlayerutils.cpp
@@ -743,12 +743,15 @@ QgsFeatureList QgsVectorLayerUtils::makeFeatureCompatible( const QgsFeature &fea
   // Fix attributes
   QgsVectorLayerUtils::matchAttributesToFields( newF, layer->fields( ) );
 
-  if ( sinkFlags & QgsFeatureSink::RegeneratePrimaryKey && layer->storageType() == QLatin1String( "GPKG" ) )
+  if ( sinkFlags & QgsFeatureSink::RegeneratePrimaryKey )
   {
-    // drop incoming fid value, let it be regenerated
-    const int fidIndex = layer->fields().lookupField( QStringLiteral( "fid" ) );
-    if ( fidIndex >= 0 )
-      newF.setAttribute( fidIndex, QVariant() );
+    // drop incoming primary key values, let them be regenerated
+    const QgsAttributeList pkIndexes = layer->dataProvider()->pkAttributeIndexes();
+    for ( int index : pkIndexes )
+    {
+      if ( index >= 0 )
+        newF.setAttribute( index, QVariant() );
+    }
   }
 
   // Does geometry need transformations?