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

Try to fix all 'not an error' errors in the Execute SQL tab

Browse Source 
See issue #478.
This commit is contained in:
Martin Kleusberg
2017-02-01 18:59:56 +01:00
parent 934dd396f4
commit 4794b0d231
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MainWindow.cpp
View File

@@ -895,7 +895,7 @@ void MainWindow::executeQuery()
sqlWidget->getEditor()->getSelection(&execution_start_line, &execution_start_index, &dummy, &dummy);
}
if (query.trimmed().isEmpty())
if (query.trimmed().isEmpty() || query.trimmed() == ";")
return;
query = query.remove(QRegExp("^\\s*BEGIN TRANSACTION;|COMMIT;\\s*$")).trimmed();
@@ -905,7 +905,7 @@ void MainWindow::executeQuery()
sqlite3_stmt *vm;
QByteArray utf8Query = query.toUtf8();
const char *tail = utf8Query.data();
int sql3status = 0;
int sql3status = SQLITE_OK;
int tail_length = utf8Query.length();
QString statusMessage;
bool modified = false;
@@ -924,7 +924,7 @@ void MainWindow::executeQuery()
//Accept multi-line queries, by looping until the tail is empty
QElapsedTimer timer;
timer.start();
do
while( tail && *tail != 0 && (sql3status == SQLITE_OK || sql3status == SQLITE_DONE))
{
// Check whether the DB structure is changed by this statement
QString qtail = QString(tail);
@@ -992,6 +992,8 @@ void MainWindow::executeQuery()
}
break;
}
case SQLITE_MISUSE:
continue;
default:
statusMessage = QString::fromUtf8((const char*)sqlite3_errmsg(db._db)) +
": " + queryPart;
@@ -1005,7 +1007,7 @@ void MainWindow::executeQuery()
}
execution_start_index = execution_end_index;
} while( tail && *tail != 0 && (sql3status == SQLITE_OK || sql3status == SQLITE_DONE));
}
sqlWidget->finishExecution(statusMessage);
plotDock->updatePlot(sqlWidget->getModel());