Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-3_40] Improve wording and help in Execute Spatialite query algorithm #60348

Merged
merged 3 commits into from
Jan 29, 2025
Merged

[Backport release-3_40] Improve wording and help in Execute Spatialite query algorithm #60348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24c129d
better wording for an input parameter in Execute SpatiaLite query
alexbruy Jan 29, 2025
3947dfc
improve algorithm help
alexbruy Jan 29, 2025
08620e3
remove debug
alexbruy Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/analysis/processing/qgsalgorithmexecutespatialitequery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
qgsalgorithmexecutepostgisquery.cpp
qgsalgorithmexecutespatialitequery.cpp
---------------------
begin : May 2020
copyright : (C) 2020 by Alexander Bruy
Expand Down Expand Up @@ -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
Expand All @@ -60,13 +60,13 @@ QgsExecuteSpatialiteQueryAlgorithm *QgsExecuteSpatialiteQueryAlgorithm::createIn

void QgsExecuteSpatialiteQueryAlgorithm::initAlgorithm( const QVariantMap & )
{
addParameter( new QgsProcessingParameterVectorLayer( QStringLiteral( "DATABASE" ), QObject::tr( "Database (connection name)" ), QList<int>() << static_cast<int>( Qgis::ProcessingSourceType::Vector ) ) );
addParameter( new QgsProcessingParameterVectorLayer( QStringLiteral( "DATABASE" ), QObject::tr( "Database layer (or file)" ), QList<int>() << static_cast<int>( Qgis::ProcessingSourceType::Vector ) ) );
addParameter( new QgsProcessingParameterString( QStringLiteral( "SQL" ), QObject::tr( "SQL query" ), QVariant(), true ) );
}

QVariantMap QgsExecuteSpatialiteQueryAlgorithm::processAlgorithm( const QVariantMap &parameters, 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 );
Expand All @@ -80,7 +80,6 @@ QVariantMap QgsExecuteSpatialiteQueryAlgorithm::processAlgorithm( const QVariant
uri = QgsDataSourceUri( QStringLiteral( "dbname='%1'" ).arg( databaseUri ) );
}

feedback->pushInfo( databaseUri );
std::unique_ptr<QgsAbstractDatabaseProviderConnection> conn;
try
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmexecutespatialitequeryregistered.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
qgsalgorithmexecutepostgisqueryregistered.cpp
qgsalgorithmexecutespatialitequeryregistered.cpp
---------------------
begin : May 2020
copyright : (C) 2020 by Alexander Bruy
Expand Down
Loading