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

Fixed executing current SQL line not working for multiple lines SQLs (#780)

Browse Source
This commit is contained in:
Iulian Onofrei
2016-09-23 00:17:48 +03:00
committed by Vlad
parent 1257134dc6
commit 420b98fee3
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/MainWindow.cpp
View File

@@ -851,18 +851,27 @@ void MainWindow::executeQuery()
// Get SQL code to execute. This depends on the button that's been pressed
QString query;
bool singleStep = false;
int execution_start_line = 0;
int execution_start_index = 0;
if(sender()->objectName() == "actionSqlExecuteLine")
{
int cursor_line, cursor_index;
sqlWidget->getEditor()->getCursorPosition(&cursor_line, &cursor_index);
SqlTextEdit *editor = sqlWidget->getEditor();
editor->getCursorPosition(&cursor_line, &cursor_index);
execution_start_line = cursor_line;
query = sqlWidget->getEditor()->text(cursor_line);
int position = editor->positionFromLineIndex(cursor_line, cursor_index);
singleStep = true;
QString entireSQL = editor->text();
QString firstPartEntireSQL = entireSQL.leftRef(position);
QString secondPartEntireSQL = entireSQL.rightRef(entireSQL.length() - position);
QString firstPartSQL = firstPartEntireSQL.split(";").last();
QString lastPartSQL = secondPartEntireSQL.split(";").first();
query = firstPartSQL + lastPartSQL;
} else {
// if a part of the query is selected, we will only execute this part
query = sqlWidget->getSelectedSql();
@@ -975,10 +984,6 @@ void MainWindow::executeQuery()
break;
}
timer.restart();
// Stop after the first full statement if we're in single step mode
if(singleStep)
break;
} else {
statusMessage = QString::fromUtf8((const char*)sqlite3_errmsg(db._db)) +
": " + queryPart;