sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-05 00:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

[OGR] Ensure orig_ogc_fid is never set as ignored field

Browse Source
This commit is contained in:
Sandro Mani 2017-09-25 13:20:01 +02:00
parent cf23d56aef
commit 15eaafdf0c
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/providers/ogr/qgsogrfeatureiterator.cpp
View File

@ -176,6 +176,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
OGR_L_SetAttributeFilter( ogrLayer, nullptr ); OGR_L_SetAttributeFilter( ogrLayer, nullptr );
} }
//start with first feature //start with first feature
rewind(); rewind();
} }

6
src/providers/ogr/qgsogrprovider.cpp
View File

@ -1022,7 +1022,11 @@ void QgsOgrProviderUtils::setRelevantFields( OGRLayerH ogrLayer, int fieldCount,
if ( !fetchAttributes.contains( i ) ) if ( !fetchAttributes.contains( i ) )
{ {
// add to ignored fields // add to ignored fields
ignoredFields.append( OGR_Fld_GetNameRef( OGR_FD_GetFieldDefn( featDefn, firstAttrIsFid ? i - 1 : i ) ) ); const char *fieldName = OGR_Fld_GetNameRef( OGR_FD_GetFieldDefn( featDefn, firstAttrIsFid ? i - 1 : i ) );
if ( qstrcmp( fieldName, "orig_ogc_fid" ) != 0 )
{
ignoredFields.append( fieldName );
}
} }
} }

12
tests/src/python/test_provider_ogr_sqlite.py
View File

@ -254,6 +254,18 @@ class TestPyQgsOGRProviderSqlite(unittest.TestCase):
self.assertTrue(it.nextFeature(f)) self.assertTrue(it.nextFeature(f))
self.assertTrue(f.id() == 5) self.assertTrue(f.id() == 5)
# Ensure that orig_ogc_fid is still retrieved even if attribute subset is passed
req = QgsFeatureRequest()
req.setSubsetOfAttributes([])
it = vl.getFeatures(req)
ids = []
while it.nextFeature(f):
ids.append(f.id())
self.assertTrue(len(ids) == 3)
self.assertTrue(3 in ids)
self.assertTrue(4 in ids)
self.assertTrue(5 in ids)
# Check that subset string is correctly set on reload # Check that subset string is correctly set on reload
vl.reload() vl.reload()
self.assertTrue(vl.fields().at(vl.fields().count() - 1).name() == "orig_ogc_fid") self.assertTrue(vl.fields().at(vl.fields().count() - 1).name() == "orig_ogc_fid")