From abe2cf8f6bd89c9d761e16877ea7800a4053003e Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Wed, 29 Jan 2025 09:36:43 +0000 Subject: [PATCH 1/3] better wording for an input parameter in Execute SpatiaLite query algorithm (refs ##53904) --- .../processing/qgsalgorithmexecutespatialitequery.cpp | 4 ++-- .../qgsalgorithmexecutespatialitequeryregistered.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp b/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp index 3611de8fb809..d4dcb2f252b2 100644 --- a/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp +++ b/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsalgorithmexecutepostgisquery.cpp + qgsalgorithmexecutespatialitequery.cpp --------------------- begin : May 2020 copyright : (C) 2020 by Alexander Bruy @@ -60,7 +60,7 @@ QgsExecuteSpatialiteQueryAlgorithm *QgsExecuteSpatialiteQueryAlgorithm::createIn void QgsExecuteSpatialiteQueryAlgorithm::initAlgorithm( const QVariantMap & ) { - addParameter( new QgsProcessingParameterVectorLayer( QStringLiteral( "DATABASE" ), QObject::tr( "Database (connection name)" ), QList() << static_cast( Qgis::ProcessingSourceType::Vector ) ) ); + addParameter( new QgsProcessingParameterVectorLayer( QStringLiteral( "DATABASE" ), QObject::tr( "Database layer (or file)" ), QList() << static_cast( Qgis::ProcessingSourceType::Vector ) ) ); addParameter( new QgsProcessingParameterString( QStringLiteral( "SQL" ), QObject::tr( "SQL query" ), QVariant(), true ) ); } diff --git a/src/analysis/processing/qgsalgorithmexecutespatialitequeryregistered.cpp b/src/analysis/processing/qgsalgorithmexecutespatialitequeryregistered.cpp index 56312cf53f5e..b4b3f0fe520a 100644 --- a/src/analysis/processing/qgsalgorithmexecutespatialitequeryregistered.cpp +++ b/src/analysis/processing/qgsalgorithmexecutespatialitequeryregistered.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsalgorithmexecutepostgisqueryregistered.cpp + qgsalgorithmexecutespatialitequeryregistered.cpp --------------------- begin : May 2020 copyright : (C) 2020 by Alexander Bruy From 4ff875ef045495ad13b839f162057ddcbc232dc5 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Wed, 29 Jan 2025 09:39:02 +0000 Subject: [PATCH 2/3] improve algorithm help --- src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp b/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp index d4dcb2f252b2..3a9ab925aef2 100644 --- a/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp +++ b/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp @@ -50,7 +50,7 @@ QString QgsExecuteSpatialiteQueryAlgorithm::groupId() const QString QgsExecuteSpatialiteQueryAlgorithm::shortHelpString() const { - return QObject::tr( "Executes a SQL command on a SpatiaLite database." ); + return QObject::tr( "Executes a SQL command on a SpatiaLite database. The database is determined by an input layer or file." ); } QgsExecuteSpatialiteQueryAlgorithm *QgsExecuteSpatialiteQueryAlgorithm::createInstance() const From 6747035857652e39003b444f529f9a07299b2599 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Wed, 29 Jan 2025 09:56:46 +0000 Subject: [PATCH 3/3] remove debug --- src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp b/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp index 3a9ab925aef2..18fba8c3f92c 100644 --- a/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp +++ b/src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp @@ -66,7 +66,7 @@ void QgsExecuteSpatialiteQueryAlgorithm::initAlgorithm( const QVariantMap & ) QVariantMap QgsExecuteSpatialiteQueryAlgorithm::processAlgorithm( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) { - //Q_UNUSED( feedback ); + Q_UNUSED( feedback ); QgsVectorLayer *layer = parameterAsVectorLayer( parameters, QStringLiteral( "DATABASE" ), context ); QString databaseUri = layer->dataProvider()->dataSourceUri(); QgsDataSourceUri uri( databaseUri ); @@ -80,7 +80,6 @@ QVariantMap QgsExecuteSpatialiteQueryAlgorithm::processAlgorithm( const QVariant uri = QgsDataSourceUri( QStringLiteral( "dbname='%1'" ).arg( databaseUri ) ); } - feedback->pushInfo( databaseUri ); std::unique_ptr conn; try {