Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,8 @@ void MainWindow::executeQuery()
if (query.isEmpty())
return;

query = query.remove(QRegExp("^\\s*BEGIN TRANSACTION;|COMMIT;\\s*$"));

//log the query
db.logSQL(query, kLogMsg_User);
sqlite3_stmt *vm;
Expand Down
10 changes: 7 additions & 3 deletions src/sqlitedb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -616,24 +616,28 @@ bool DBBrowserDB::executeMultiSQL(const QString& statement, bool dirty, bool log
if(!isOpen())
return false;

QString query = statement;

query.remove(QRegExp("^\\s*BEGIN TRANSACTION;|COMMIT;\\s*$"));

// Log the statement if needed
if(log)
logSQL(statement, kLogMsg_App);
logSQL(query, kLogMsg_App);

// Set DB to dirty/create restore point if necessary
if(dirty)
setSavepoint();

// Show progress dialog
int statement_size = statement.size();
int statement_size = query.size();
QProgressDialog progress(tr("Executing SQL..."),
tr("Cancel"), 0, statement_size);
progress.setWindowModality(Qt::ApplicationModal);
progress.show();

// Execute the statement by looping until SQLite stops giving back a tail string
sqlite3_stmt* vm;
QByteArray utf8Query = statement.toUtf8();
QByteArray utf8Query = query.toUtf8();
const char *tail = utf8Query.data();
int res = 0;
unsigned int line = 0;
Expand Down