sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-04 00:30:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Fix string escaping when converting models to python code

Browse Source 
with expression parameters

Fixes #32451
This commit is contained in:
Nyall Dawson 2019-10-29 14:11:17 +10:00
parent 328f365b16
commit e3eb4f54ab
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/processing/models/qgsprocessingmodelchildparametersource.cpp
View File

@ -169,7 +169,7 @@ QString QgsProcessingModelChildParameterSource::asPythonCode( const QgsProcessin
} }
case Expression: case Expression:
return QStringLiteral( "QgsExpression('%1').evaluate()" ).arg( mExpression ); return QStringLiteral( "QgsExpression(%1).evaluate()" ).arg( QgsProcessingUtils::stringToPythonLiteral( mExpression ) );
case ExpressionText: case ExpressionText:
return mExpressionText; return mExpressionText;

3
tests/src/analysis/testqgsprocessing.cpp
View File

@ -6894,6 +6894,9 @@ void TestQgsProcessing::modelerAlgorithm()
expSource.setExpression( "1+3" ); expSource.setExpression( "1+3" );
QCOMPARE( expSource.expression(), QStringLiteral( "1+3" ) ); QCOMPARE( expSource.expression(), QStringLiteral( "1+3" ) );
QCOMPARE( expSource.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, nullptr, friendlyNames ), QStringLiteral( "QgsExpression('1+3').evaluate()" ) ); QCOMPARE( expSource.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, nullptr, friendlyNames ), QStringLiteral( "QgsExpression('1+3').evaluate()" ) );
expSource.setExpression( "'a' || 'b\\'c'" );
QCOMPARE( expSource.expression(), QStringLiteral( "'a' || 'b\\'c'" ) );
QCOMPARE( expSource.asPythonCode( QgsProcessing::PythonQgsProcessingAlgorithmSubclass, nullptr, friendlyNames ), QStringLiteral( "QgsExpression('\\'a\\' || \\'b\\\\\\'c\\'').evaluate()" ) );
expSource = QgsProcessingModelChildParameterSource::fromStaticValue( 5 ); expSource = QgsProcessingModelChildParameterSource::fromStaticValue( 5 );
// check that calling setExpression flips source to Expression // check that calling setExpression flips source to Expression
QCOMPARE( expSource.source(), QgsProcessingModelChildParameterSource::StaticValue ); QCOMPARE( expSource.source(), QgsProcessingModelChildParameterSource::StaticValue );