Fix QgsExpressionNodeColumnRef::prepareNode

Hugo Mercier · Hugo Mercier · commit 61db81071ac6 · 2019-02-18T11:36:17.000+01:00
Look also for the attribute in the feature, as it is done by evalNode()
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

Original file line number	Diff line number	Diff line change
`@@ -1261,16 +1261,18 @@ bool QgsExpressionNodeColumnRef::prepareNode( QgsExpression *parent, const QgsEx`
`1261`	`1261`	`QgsFields fields = qvariant_cast<QgsFields>( context->variable( QgsExpressionContext::EXPR_FIELDS ) );`
`1262`	`1262`
`1263`	`1263`	`mIndex = fields.lookupField( mName );`
`1264`		`- if ( mIndex >= 0 )`
	`1264`	`+`
	`1265`	`+ if ( mIndex == -1 && context->hasFeature() )`
`1265`	`1266`	`{`
`1266`		`- return true;`
	`1267`	`+ mIndex = context->feature().fieldNameIndex( mName );`
`1267`	`1268`	`}`
`1268`		`- else`
	`1269`	`+`
	`1270`	`+ if ( mIndex == -1 )`
`1269`	`1271`	`{`
`1270`	`1272`	`parent->setEvalErrorString( tr( "Column '%1' not found" ).arg( mName ) );`
`1271`		`- mIndex = -1;`
`1272`	`1273`	`return false;`
`1273`	`1274`	`}`
	`1275`	`+ return true;`
`1274`	`1276`	`}`
`1275`	`1277`
`1276`	`1278`	`QString QgsExpressionNodeColumnRef::dump() const`