Fix conversion of direct vector layer parameters to python strings

nyalldawson · nyalldawson · commit d2a90f40e34e · 2017-08-20T18:21:02.000+10:00
diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp
@@ -2565,6 +2565,10 @@ QString QgsProcessingParameterFeatureSource::valueAsPythonString( const QVariant
       }
     }
   }
+  else if ( QgsVectorLayer *layer = qobject_cast< QgsVectorLayer * >( qvariant_cast<QObject *>( value ) ) )
+  {
+    return layer->source().prepend( '\'' ).append( '\'' );
+  }
 
   return value.toString().prepend( '\'' ).append( '\'' );
 }
diff --git a/tests/src/core/testqgsprocessing.cpp b/tests/src/core/testqgsprocessing.cpp
@@ -3442,6 +3442,7 @@ void TestQgsProcessing::parameterFeatureSource()
   QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( "abc" ), true ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition('abc', True)" ) );
   QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromExpression( "\"abc\" || \"def\"" ) ) ), context ), QStringLiteral( "QgsProperty.fromExpression('\"abc\" || \"def\"')" ) );
   QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProperty::fromExpression( "\"a\"=1" ) ), context ), QStringLiteral( "QgsProperty.fromExpression('\"a\"=1')" ) );
+  QCOMPARE( def->valueAsPythonString( QVariant::fromValue( v2 ), context ), QStringLiteral( "'%1'" ).arg( vector2 ) );
 
   QVariantMap map = def->toVariantMap();
   QgsProcessingParameterFeatureSource fromMap( "x" );

Original file line number	Diff line number	Diff line change
`@@ -2565,6 +2565,10 @@ QString QgsProcessingParameterFeatureSource::valueAsPythonString( const QVariant`
`2565`	`2565`	`}`
`2566`	`2566`	`}`
`2567`	`2567`	`}`
	`2568`	`+ else if ( QgsVectorLayer layer = qobject_cast< QgsVectorLayer >( qvariant_cast<QObject *>( value ) ) )`
	`2569`	`+ {`
	`2570`	`+ return layer->source().prepend( '\'' ).append( '\'' );`
	`2571`	`+ }`
`2568`	`2572`
`2569`	`2573`	`return value.toString().prepend( '\'' ).append( '\'' );`
`2570`	`2574`	`}`