fix NULL support in expression evaluation

jef-n · jef-n · commit 8da496e6d77c · 2011-11-03T23:31:51.000+01:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -87,7 +87,7 @@ inline bool isDoubleSafe( const QVariant& v )
   return false;
 }
 
-inline bool isNull( const QVariant& v ) { return v.type() == QVariant::Invalid; }
+inline bool isNull( const QVariant& v ) { return v.isNull(); }
 
 ///////////////////////////////////////////////
 // evaluation error macros
@@ -149,7 +149,7 @@ static int getIntValue( const QVariant& value, QgsExpression* parent )
 static TVL getTVLValue( const QVariant& value, QgsExpression* parent )
 {
   // we need to convert to TVL
-  if ( value.type() == QVariant::Invalid )
+  if ( value.isNull() )
     return Unknown;
 
   if ( value.type() == QVariant::Int )
@@ -928,13 +928,15 @@ bool QgsExpression::NodeLiteral::prepare( QgsExpression* /*parent*/, const QgsFi
 
 QString QgsExpression::NodeLiteral::dump() const
 {
+  if ( mValue.isNull() )
+    return "NULL";
+
   switch ( mValue.type() )
   {
-    case QVariant::Invalid: return "NULL";
     case QVariant::Int: return QString::number( mValue.toInt() );
     case QVariant::Double: return QString::number( mValue.toDouble() );
     case QVariant::String: return QString( "'%1'" ).arg( mValue.toString() );
-    default: return "[unsupported value]";
+    default: return QString( "[unsupported type;%1; value:%2]" ).arg( mValue.typeName() ).arg( mValue.toString() );
   }
 }
 
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -463,7 +463,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
       QgsDebugMsg( "Expression parser error:" + exp->parserErrorString() );
       return;
     }
-    QVariant result = exp->evaluate( &f, layer->dataProvider()->fields() );
+    QVariant result = exp->evaluate( &f, layer->pendingFields() );
     if ( exp->hasEvalError() )
     {
       QgsDebugMsg( "Expression parser eval error:" + exp->evalErrorString() );

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ inline bool isDoubleSafe( const QVariant& v )`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`
`90`		`-inline bool isNull( const QVariant& v ) { return v.type() == QVariant::Invalid; }`
	`90`	`+inline bool isNull( const QVariant& v ) { return v.isNull(); }`
`91`	`91`
`92`	`92`	`///////////////////////////////////////////////`
`93`	`93`	`// evaluation error macros`
`@@ -149,7 +149,7 @@ static int getIntValue( const QVariant& value, QgsExpression* parent )`
`149`	`149`	`static TVL getTVLValue( const QVariant& value, QgsExpression* parent )`
`150`	`150`	`{`
`151`	`151`	`// we need to convert to TVL`
`152`		`- if ( value.type() == QVariant::Invalid )`
	`152`	`+ if ( value.isNull() )`
`153`	`153`	`return Unknown;`
`154`	`154`
`155`	`155`	`if ( value.type() == QVariant::Int )`
`@@ -928,13 +928,15 @@ bool QgsExpression::NodeLiteral::prepare( QgsExpression* /parent/, const QgsFi`
`928`	`928`
`929`	`929`	`QString QgsExpression::NodeLiteral::dump() const`
`930`	`930`	`{`
	`931`	`+ if ( mValue.isNull() )`
	`932`	`+ return "NULL";`
	`933`	`+`
`931`	`934`	`switch ( mValue.type() )`
`932`	`935`	`{`
`933`		`- case QVariant::Invalid: return "NULL";`
`934`	`936`	`case QVariant::Int: return QString::number( mValue.toInt() );`
`935`	`937`	`case QVariant::Double: return QString::number( mValue.toDouble() );`
`936`	`938`	`case QVariant::String: return QString( "'%1'" ).arg( mValue.toString() );`
`937`		`- default: return "[unsupported value]";`
	`939`	`+ default: return QString( "[unsupported type;%1; value:%2]" ).arg( mValue.typeName() ).arg( mValue.toString() );`
`938`	`940`	`}`
`939`	`941`	`}`
`940`	`942`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer, QgsFeature& f`
`463`	`463`	`QgsDebugMsg( "Expression parser error:" + exp->parserErrorString() );`
`464`	`464`	`return;`
`465`	`465`	`}`
`466`		`- QVariant result = exp->evaluate( &f, layer->dataProvider()->fields() );`
	`466`	`+ QVariant result = exp->evaluate( &f, layer->pendingFields() );`
`467`	`467`	`if ( exp->hasEvalError() )`
`468`	`468`	`{`
`469`	`469`	`QgsDebugMsg( "Expression parser eval error:" + exp->evalErrorString() );`