Merge pull request #601 from matthias-kuhn/qgsexpression-unprepared

Allow unprepared execution of QgsExpression
qgis · May 22, 2013 · 3306c7c · 3306c7c
2 parents b7f1987 + 6af9261
commit 3306c7c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -2243,7 +2243,10 @@ QVariant QgsExpression::NodeColumnRef::eval( QgsExpression* /*parent*/, QgsFeatu
 {
   if ( f )
   {
-    return f->attribute( mIndex );
+    if ( mIndex >= 0 )
+      return f->attribute( mIndex );
+    else
+      return f->attribute( mName );
   }
   return QVariant( "[" + mName + "]" );
 }