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

Jump to bottom

Layer context execute sql #59641

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Layer context execute sql #59641

merged 2 commits into from
Nov 29, 2024

Conversation

jef-n
Copy link
Member

@jef-n jef-n commented Nov 28, 2024

image

@github-actions github-actions bot added this to the 3.42.0 milestone Nov 28, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 28, 2024 •
edited
Loading

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 16b1e8c)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 16b1e8c)

nyalldawson
nyalldawson reviewed Nov 29, 2024
View reviewed changes
src/app/qgsapplayertreeviewmenuprovider.cpp
if ( conn->capabilities().testFlag( QgsAbstractDatabaseProviderConnection::Capability::ExecuteSql ) )
menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/dbmanager.svg" ) ), tr( "Execute SQL…" ), menu, [ layer, this ]
{
std::unique_ptr< QgsAbstractDatabaseProviderConnection> conn2 { QgsMapLayerUtils::databaseConnection( layer ) };
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For safety, I think layer should by made a QPointer so that we don't risk trying to access a removed layer here. (The event loop have had a chance to run since the previous nullptr checks on layer/vlayer)

src/gui/qgsqueryresultwidget.cpp Outdated
@@ -521,7 +521,7 @@ void QgsQueryResultWidget::copyResults( int fromRow, int toRow, int fromColumn,

QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions QgsQueryResultWidget::sqlVectorLayerOptions() const
{
mSqlVectorLayerOptions.sql = mSqlEditor->text();
mSqlVectorLayerOptions.sql = mSqlEditor->text().replace( QRegularExpression( ";\\s*$" ), "" );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
mSqlVectorLayerOptions.sql = mSqlEditor->text().replace( QRegularExpression( ";\\s*$" ), "" );
mSqlVectorLayerOptions.sql = mSqlEditor->text().replace( QRegularExpression( ";\\s*$" ), QString() );

@nyalldawson
Copy link
Collaborator

Nice feature!

@nyalldawson nyalldawson added Needs Documentation When merging a labeled PR, an issue will be created in the Doc repo. Changelog Items that are queued to appear in the visual changelog - remove after harvesting labels Nov 29, 2024
@qgis-bot
Copy link
Collaborator

@jef-n
This pull request has been tagged as requiring documentation.

A documentation ticket will be opened at https://github.com/qgis/QGIS-Documentation when this PR is merged.

Please update the description (not the comments) with helpful description and screenshot to help the work from documentors.
Also, any commit having [needs-doc] or [Needs Documentation] in will see its message pushed to the issue, so please be as verbose as you can.

Thank you!

@qgis-bot
Copy link
Collaborator

@jef-n

This pull request has been tagged for the changelog.

  • The description will be harvested so please provide a "nearly-ready" text for the final changelog
  • If possible, add a nice illustration of the feature. Only the first one in the description will be harvested (GIF accepted as well)
  • If you can, it's better to give credits to your sponsor, see below for different formats.

You can edit the description.

Format available for credits
  • Funded by NAME
  • Funded by URL
  • Funded by NAME URL
  • Sponsored by NAME
  • Sponsored by URL
  • Sponsored by NAME URL

Thank you!

@nyalldawson nyalldawson merged commit ee17e9a into qgis:master Nov 29, 2024
29 checks passed
@qgis-bot
Copy link
Collaborator

@jef-n
A documentation ticket has been opened at qgis/QGIS-Documentation#9430
It is your responsibility to visit this ticket and add as much detail as possible for the documentation team to correctly document this change.
Thank you!

@qgis-bot qgis-bot mentioned this pull request Nov 29, 2024
Closed
@jef-n jef-n deleted the layer-context-execute-sql branch November 29, 2024 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nyalldawson nyalldawson nyalldawson approved these changes

Assignees
No one assigned
Labels
Changelog Items that are queued to appear in the visual changelog - remove after harvesting Needs Documentation When merging a labeled PR, an issue will be created in the Doc repo.
Projects
None yet
Milestone
3.42.0
Development

Successfully merging this pull request may close these issues.
3 participants
@jef-n @nyalldawson @qgis-bot