[OGR provider] Support 64bit FID (partially implemented per 8f3d44d in master) (fixes #16404)

rouault · rouault · commit 2c49631bc98d · 2017-11-13T15:49:14.000+01:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1807,7 +1807,7 @@ bool QgsOgrProvider::changeGeometryValues( const QgsGeometryMap &geometry_map )
 
   for ( QgsGeometryMap::const_iterator it = geometry_map.constBegin(); it != geometry_map.constEnd(); ++it )
   {
-    gdal::ogr_feature_unique_ptr theOGRFeature( mOgrLayer->GetFeature( static_cast<long>( FID_TO_NUMBER( it.key() ) ) ) );
+    gdal::ogr_feature_unique_ptr theOGRFeature( mOgrLayer->GetFeature( FID_TO_NUMBER( it.key() ) ) );
     if ( !theOGRFeature )
     {
       pushError( tr( "OGR error changing geometry: feature %1 not found" ).arg( it.key() ) );
diff --git a/tests/src/python/test_provider_ogr_gpkg.py b/tests/src/python/test_provider_ogr_gpkg.py
@@ -600,6 +600,38 @@ def testGeopackageRefreshIfTableListUpdated(self):
         vl2.subLayers()
         self.assertEqual(vl2.dataProvider().subLayers(), ['0:test:0:Point:geom', '1:test2:0:Point:geom'])
 
+    def testGeopackageLargeFID(self):
+
+        tmpfile = os.path.join(self.basetestpath, 'testGeopackageLargeFID.gpkg')
+        ds = ogr.GetDriverByName('GPKG').CreateDataSource(tmpfile)
+        lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
+        lyr.CreateField(ogr.FieldDefn('str_field', ogr.OFTString))
+        ds = None
+
+        vl = QgsVectorLayer(u'{}'.format(tmpfile) + "|layername=" + "test", 'test', u'ogr')
+        f = QgsFeature()
+        f.setAttributes([1234567890123, None])
+        self.assertTrue(vl.startEditing())
+        self.assertTrue(vl.dataProvider().addFeatures([f]))
+        self.assertTrue(vl.commitChanges())
+
+        got = [feat for feat in vl.getFeatures()][0]
+        self.assertEqual(got['fid'], 1234567890123)
+
+        self.assertTrue(vl.startEditing())
+        self.assertTrue(vl.changeGeometry(1234567890123, QgsGeometry.fromWkt('Point (3 50)')))
+        self.assertTrue(vl.changeAttributeValue(1234567890123, 1, 'foo'))
+        self.assertTrue(vl.commitChanges())
+
+        got = [feat for feat in vl.getFeatures()][0]
+        self.assertEqual(got['str_field'], 'foo')
+        got_geom = got.geometry()
+        self.assertIsNotNone(got_geom)
+
+        self.assertTrue(vl.startEditing())
+        self.assertTrue(vl.deleteFeature(1234567890123))
+        self.assertTrue(vl.commitChanges())
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ bool QgsOgrProvider::changeGeometryValues( const QgsGeometryMap &geometry_map )`
`1807`	`1807`
`1808`	`1808`	`for ( QgsGeometryMap::const_iterator it = geometry_map.constBegin(); it != geometry_map.constEnd(); ++it )`
`1809`	`1809`	`{`
`1810`		`- gdal::ogr_feature_unique_ptr theOGRFeature( mOgrLayer->GetFeature( static_cast<long>( FID_TO_NUMBER( it.key() ) ) ) );`
	`1810`	`+ gdal::ogr_feature_unique_ptr theOGRFeature( mOgrLayer->GetFeature( FID_TO_NUMBER( it.key() ) ) );`
`1811`	`1811`	`if ( !theOGRFeature )`
`1812`	`1812`	`{`
`1813`	`1813`	`pushError( tr( "OGR error changing geometry: feature %1 not found" ).arg( it.key() ) );`