Fix caching aggregate expressions with @parent usage

qgis · Oct 31, 2016 · 1b2158d · 1b2158d
1 parent f438542
commit 1b2158d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -701,8 +701,12 @@ static QVariant fcnAggregate( const QVariantList& values, const QgsExpressionCon
   {
     QString cacheKey = QStringLiteral( "aggfcn:%1:%2:%3:%4" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter );
 
+    QgsExpression subExp( subExpression );
     QgsExpression filterExp( parameters.filter );
-    if ( filterExp.referencedVariables().contains( "parent" ) || filterExp.referencedVariables().contains( QString() ) )
+    if ( filterExp.referencedVariables().contains( "parent" )
+         || filterExp.referencedVariables().contains( QString() )
+         || subExp.referencedVariables().contains( "parent" )
+         || subExp.referencedVariables().contains( QString() ) )
     {
       cacheKey += ':' + qHash( context->feature() );
     }