Fix FilterExpression feature requests will ignore expression if

using virtual fields or other complex filters refs #13695
qgis · Nov 2, 2015 · dddd043 · dddd043
1 parent 556d87a
commit dddd043
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -236,6 +236,17 @@ bool QgsVectorLayerFeatureIterator::fetchFeature( QgsFeature& f )
     if ( mHasVirtualAttributes )
       addVirtualAttributes( f );
 
+    if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression && mProviderRequest.filterType() != QgsFeatureRequest::FilterExpression )
+    {
+        //filtering by expression, and couldn't do it on the provider side
+        mRequest.expressionContext()->setFeature( f );
+        if ( !mRequest.filterExpression()->evaluate( mRequest.expressionContext() ).toBool() )
+        {
+          //feature did not match filter
+          continue;
+        }
+    }
+
     // update geometry
     // TODO[MK]: FilterRect check after updating the geometry
     if ( !( mRequest.flags() & QgsFeatureRequest::NoGeometry ) )