Fix feature fields does not include virtual or joined fields when

feature is requested using a QgsFeatureRequest with FilterFid
qgis · May 11, 2016 · d5d7634 · d5d7634
1 parent c68d7f9
commit d5d7634
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -801,6 +801,8 @@ bool QgsVectorLayerFeatureIterator::nextFeatureFid( QgsFeature& f )
   QgsFeatureIterator fi = mSource->mProviderFeatureSource->getFeatures( mProviderRequest );
   if ( fi.nextFeature( f ) )
   {
+    f.setFields( mSource->mFields );
+
     if ( mSource->mHasEditBuffer )
       updateChangedAttributes( f );
 

diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -967,8 +967,15 @@ def test_ExpressionField(self):
 
         idx = layer.addExpressionField('5', QgsField('test', QVariant.LongLong))
 
-        self.assertEquals(layer.getFeatures().next()[idx], 5)
-        self.assertEquals(layer.pendingFields().count(), cnt + 1)
+        fet = next(layer.getFeatures())
+        self.assertEqual(fet[idx], 5)
+        # check fields
+        self.assertEqual(layer.fields().count(), cnt + 1)
+        self.assertEqual(fet.fields(), layer.fields())
+
+        # retrieve single feature and check fields
+        fet = next(layer.getFeatures(QgsFeatureRequest().setFilterFid(1)))
+        self.assertEqual(fet.fields(), layer.fields())
 
         layer.updateExpressionField(idx, '9')