care for types of fid

signedav · signedav · commit d1172d41065f · 2018-10-22T11:46:46.000+02:00
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -749,11 +749,15 @@ QgsVectorLayer *QgsOfflineEditing::copyVectorLayer( QgsVectorLayer *layer, sqlit
       // NOTE: SpatiaLite provider ignores position of geometry column
       // fill gap in QgsAttributeMap if geometry column is not last (WORKAROUND)
       QgsAttributes attrs = f.attributes();
-
       int column = 0;
-      //newAttrs have an additional attribute (fid), so we have to add a dummy
-      if ( containerType == GPKG && layer->dataProvider()->fields().lookupField( "fid" ) >= 0 )
+      int indexOfFid = layer->dataProvider()->fields().lookupField( "fid" );
+      if ( containerType == GPKG && ( indexOfFid == -1 || ( layer->dataProvider()->fields().at( indexOfFid ).type() != QVariant::Int
+                                      && layer->dataProvider()->fields().at( indexOfFid ).type() != QVariant::LongLong ) ) )
+      {
+        // newAttrs (1) has an additional attribute (fid) that is (2) of the correct type
+        // so we have to add a dummy because otherwise it messes up with the amount of attributes
         column++;
+      }
       QgsAttributes newAttrs( attrs.count() + column );
       for ( int it = 0; it < attrs.count(); ++it )
       {
