Also support invalid-as-null variants

m-kuhn · m-kuhn · commit 00207c84aa50 · 2017-05-01T00:04:29.000+02:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -5920,7 +5920,10 @@ bool QgsExpression::NodeCondition::isStatic( QgsExpression *parent, const QgsExp
       return false;
   }
 
-  return mElseExp->isStatic( parent, context );
+  if ( mElseExp )
+    return mElseExp->isStatic( parent, context );
+
+  return true;
 }
 
 
@@ -6330,9 +6333,9 @@ QSet<QString> QgsExpression::StaticFunction::referencedColumns( const NodeFuncti
 
 QVariant QgsExpression::Node::eval( QgsExpression *parent, const QgsExpressionContext *context )
 {
-  if ( mStaticValue.isValid() )
+  if ( mHasCachedValue )
   {
-    return mStaticValue;
+    return mCachedStaticValue;
   }
   else
   {
@@ -6345,11 +6348,13 @@ bool QgsExpression::Node::prepare( QgsExpression *parent, const QgsExpressionCon
 {
   if ( isStatic( parent, context ) )
   {
-    mStaticValue = evalNode( parent, context );
+    mCachedStaticValue = evalNode( parent, context );
+    mHasCachedValue = true;
     return true;
   }
   else
   {
+    mHasCachedValue = false;
     return prepareNode( parent, context );
   }
 }
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -941,7 +941,8 @@ class CORE_EXPORT QgsExpression
          */
         virtual QVariant evalNode( QgsExpression *parent, const QgsExpressionContext *context ) = 0;
 
-        QVariant mStaticValue;
+        bool mHasCachedValue = false;
+        QVariant mCachedStaticValue;
     };
 
     //! Named node

Original file line number	Diff line number	Diff line change
`@@ -5920,7 +5920,10 @@ bool QgsExpression::NodeCondition::isStatic( QgsExpression *parent, const QgsExp`
`5920`	`5920`	`return false;`
`5921`	`5921`	`}`
`5922`	`5922`
`5923`		`- return mElseExp->isStatic( parent, context );`
	`5923`	`+ if ( mElseExp )`
	`5924`	`+ return mElseExp->isStatic( parent, context );`
	`5925`	`+`
	`5926`	`+ return true;`
`5924`	`5927`	`}`
`5925`	`5928`
`5926`	`5929`
`@@ -6330,9 +6333,9 @@ QSet<QString> QgsExpression::StaticFunction::referencedColumns( const NodeFuncti`
`6330`	`6333`
`6331`	`6334`	`QVariant QgsExpression::Node::eval( QgsExpression parent, const QgsExpressionContext context )`
`6332`	`6335`	`{`
`6333`		`- if ( mStaticValue.isValid() )`
	`6336`	`+ if ( mHasCachedValue )`
`6334`	`6337`	`{`
`6335`		`- return mStaticValue;`
	`6338`	`+ return mCachedStaticValue;`
`6336`	`6339`	`}`
`6337`	`6340`	`else`
`6338`	`6341`	`{`
`@@ -6345,11 +6348,13 @@ bool QgsExpression::Node::prepare( QgsExpression *parent, const QgsExpressionCon`
`6345`	`6348`	`{`
`6346`	`6349`	`if ( isStatic( parent, context ) )`
`6347`	`6350`	`{`
`6348`		`- mStaticValue = evalNode( parent, context );`
	`6351`	`+ mCachedStaticValue = evalNode( parent, context );`
	`6352`	`+ mHasCachedValue = true;`
`6349`	`6353`	`return true;`
`6350`	`6354`	`}`
`6351`	`6355`	`else`
`6352`	`6356`	`{`
	`6357`	`+ mHasCachedValue = false;`
`6353`	`6358`	`return prepareNode( parent, context );`
`6354`	`6359`	`}`
`6355`	`6360`	`}`