Allow unprepared execution of QgsExpression

m-kuhn · m-kuhn · commit 6af9261fa3f3 · 2013-05-22T10:52:45.000+02:00
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 + "]" );
 }

Original file line number	Diff line number	Diff line change
`@@ -2243,7 +2243,10 @@ QVariant QgsExpression::NodeColumnRef::eval( QgsExpression* /parent/, QgsFeatu`
`2243`	`2243`	`{`
`2244`	`2244`	`if ( f )`
`2245`	`2245`	`{`
`2246`		`- return f->attribute( mIndex );`
	`2246`	`+ if ( mIndex >= 0 )`
	`2247`	`+ return f->attribute( mIndex );`
	`2248`	`+ else`
	`2249`	`+ return f->attribute( mName );`
`2247`	`2250`	`}`
`2248`	`2251`	`return QVariant( "[" + mName + "]" );`
`2249`	`2252`	`}`