[processing] Fix iterating mode when output is a temporary layer

Credit to @volaya for this fix! Fixes #29340
qgis · Jun 12, 2019 · d036322 · d036322
1 parent 2742609
commit d036322
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -550,7 +550,12 @@ QVariant QgsProcessingUtils::generateIteratingDestination( const QVariant &input
   else
   {
     QString res = input.toString();
-    if ( res.startsWith( QLatin1String( "memory:" ) ) )
+    if ( res == QgsProcessing::TEMPORARY_OUTPUT )
+    {
+      // temporary outputs map to temporary outputs!
+      return QgsProcessing::TEMPORARY_OUTPUT;
+    }
+    else if ( res.startsWith( QLatin1String( "memory:" ) ) )
     {
       return res + '_' + id.toString();
     }

diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -5548,6 +5548,8 @@ void TestQgsProcessing::generateIteratingDestination()
   QCOMPARE( QgsProcessingUtils::generateIteratingDestination( "ape.shp", 1, context ).toString(), QStringLiteral( "ape_1.shp" ) );
   QCOMPARE( QgsProcessingUtils::generateIteratingDestination( "ape.shp", 2, context ).toString(), QStringLiteral( "ape_2.shp" ) );
   QCOMPARE( QgsProcessingUtils::generateIteratingDestination( "/home/bif.o/ape.shp", 2, context ).toString(), QStringLiteral( "/home/bif.o/ape_2.shp" ) );
+  QCOMPARE( QgsProcessingUtils::generateIteratingDestination( QgsProcessing::TEMPORARY_OUTPUT, 2, context ).toString(), QgsProcessing::TEMPORARY_OUTPUT );
+  QCOMPARE( QgsProcessingUtils::generateIteratingDestination( QgsProperty::fromValue( QgsProcessing::TEMPORARY_OUTPUT ), 2, context ).toString(), QgsProcessing::TEMPORARY_OUTPUT );
 
   QgsProject p;
   QgsProcessingOutputLayerDefinition def;
@@ -5565,6 +5567,15 @@ void TestQgsProcessing::generateIteratingDestination()
   fromVar = qvariant_cast<QgsProcessingOutputLayerDefinition>( res );
   QCOMPARE( fromVar.sink.staticValue().toString(), QStringLiteral( "ape_2.shp" ) );
   QCOMPARE( fromVar.destinationProject, &p );
+
+  QgsProcessingOutputLayerDefinition def2;
+  def2.sink = QgsProperty::fromValue( QgsProcessing::TEMPORARY_OUTPUT );
+  def2.destinationProject = &p;
+  res = QgsProcessingUtils::generateIteratingDestination( def2, 2, context );
+  QVERIFY( res.canConvert<QgsProcessingOutputLayerDefinition>() );
+  fromVar = qvariant_cast<QgsProcessingOutputLayerDefinition>( res );
+  QCOMPARE( fromVar.sink.staticValue().toString(), QgsProcessing::TEMPORARY_OUTPUT );
+  QCOMPARE( fromVar.destinationProject, &p );
 }
 
 void TestQgsProcessing::asPythonCommand()