mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-19 10:20:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix executing selection only in Execute SQL tab

Browse Source 
When executing only a part of a query by selecting the start of it in
the Execute SQL tab, SQLite would execute it until the next semicolon,
even when the selection does not go as far. This commit changes this
back to the old behaviour to only ever execute exactly the selected part
of a query.

See issue #1708.
This commit is contained in:
Martin Kleusberg
2019-01-14 20:06:46 +01:00
parent 5dc59feeea
commit fbef621e5a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MainWindow.cpp
View File

@@ -1470,10 +1470,16 @@ void MainWindow::executeQuery()
sqlWidget->finishExecution(log_message, ok);
};
// Get the statement(s) to execute. When in selection mode crop the query string at exactly the end of the selection to make sure SQLite has
// no chance to execute any further.
QString sql = sqlWidget->getSql();
if(mode == Selection)
sql = sql.left(execute_to_position);
// Prepare the SQL worker to run the query. We set the context of each signal-slot connection to the current SQL execution area.
// This means that if the tab is closed all these signals are automatically disconnected so the lambdas won't be called for a not
// existing execution area.
execute_sql_worker.reset(new RunSql(db, sqlWidget->getSql(), execute_from_position, execute_to_position, true));
execute_sql_worker.reset(new RunSql(db, sql, execute_from_position, execute_to_position, true));
connect(execute_sql_worker.get(), &RunSql::statementErrored, sqlWidget, [query_logger, this, sqlWidget](const QString& status_message, int from_position, int to_position) {
sqlWidget->getModel()->reset();