Use QgsFields::fieldNameIndex when preparing column refs in expressions

nyalldawson · nyalldawson · commit 0a84fbd6b5bf · 2015-12-10T16:17:46.000+11:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -3626,17 +3626,17 @@ bool QgsExpression::NodeColumnRef::prepare( QgsExpression *parent, const QgsExpr
 
   QgsFields fields = qvariant_cast<QgsFields>( context->variable( QgsExpressionContext::EXPR_FIELDS ) );
 
-  for ( int i = 0; i < fields.count(); ++i )
+  mIndex = fields.fieldNameIndex( mName );
+  if ( mIndex >= 0 )
   {
-    if ( QString::compare( fields.at( i ).name(), mName, Qt::CaseInsensitive ) == 0 )
-    {
-      mIndex = i;
-      return true;
-    }
+    return true;
+  }
+  else
+  {
+    parent->mEvalErrorString = tr( "Column '%1' not found" ).arg( mName );
+    mIndex = -1;
+    return false;
   }
-  parent->mEvalErrorString = tr( "Column '%1' not found" ).arg( mName );
-  mIndex = -1;
-  return false;
 }
 
 QString QgsExpression::NodeColumnRef::dump() const
