[processing] Don't skip null parameter values when converting

parameters to pythong strings We need to include these, in order to differentiate unspecified parameters from parameters set to null values (cherry-picked from c738bcf)
qgis · May 11, 2018 · 6ad50f7 · 6ad50f7
1 parent 123f2df
commit 6ad50f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp
@@ -258,7 +258,7 @@ QString QgsProcessingAlgorithm::asPythonCommand( const QVariantMap &parameters,
     if ( def->flags() & QgsProcessingParameterDefinition::FlagHidden )
       continue;
 
-    if ( !parameters.contains( def->name() ) || !parameters.value( def->name() ).isValid() )
+    if ( !parameters.contains( def->name() ) )
       continue;
 
     parts << QStringLiteral( "'%1':%2" ).arg( def->name(), def->valueAsPythonString( parameters.value( def->name() ), context ) );

diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -290,8 +290,7 @@ class DummyAlgorithm : public QgsProcessingAlgorithm
       params.insert( "p1", "a" );
       QCOMPARE( asPythonCommand( params, context ), QStringLiteral( "processing.run(\"test\", {'p1':'a'})" ) );
       params.insert( "p2", QVariant() );
-      // not set, should be no change
-      QCOMPARE( asPythonCommand( params, context ), QStringLiteral( "processing.run(\"test\", {'p1':'a'})" ) );
+      QCOMPARE( asPythonCommand( params, context ), QStringLiteral( "processing.run(\"test\", {'p1':'a','p2':None})" ) );
       params.insert( "p2", "b" );
       QCOMPARE( asPythonCommand( params, context ), QStringLiteral( "processing.run(\"test\", {'p1':'a','p2':'b'})" ) );