Fix QgsExpressionNodeColumnRef::prepareNode

Look also for the attribute in the feature, as it is done by evalNode()
qgis · Feb 14, 2019 · ee980ca · ee980ca
1 parent 8091966
commit ee980ca
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/core/expression/qgsexpressionnodeimpl.cpp b/src/core/expression/qgsexpressionnodeimpl.cpp
@@ -1261,16 +1261,18 @@ bool QgsExpressionNodeColumnRef::prepareNode( QgsExpression *parent, const QgsEx
   QgsFields fields = qvariant_cast<QgsFields>( context->variable( QgsExpressionContext::EXPR_FIELDS ) );
 
   mIndex = fields.lookupField( mName );
-  if ( mIndex >= 0 )
+
+  if ( mIndex == -1 && context->hasFeature() )
   {
-    return true;
+    mIndex = context->feature().fieldNameIndex( mName );
   }
-  else
+
+  if ( mIndex == -1 )
   {
     parent->setEvalErrorString( tr( "Column '%1' not found" ).arg( mName ) );
-    mIndex = -1;
     return false;
   }
+  return true;
 }
 
 QString QgsExpressionNodeColumnRef::dump() const