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

only revert if the db wasn't dirty before

Browse Source 
otherwise we might have reverted pre execute query transactions
This commit is contained in:
Peinthor Rene
2013-03-28 10:55:09 +01:00
parent 16a40ed349
commit 50b160227b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MainWindow.cpp
View File

@@ -768,6 +768,13 @@ void MainWindow::executeQuery()
int sql3status = 0;
QString statusMessage;
bool modified = false;
bool wasdirty = db.getDirty();
// there is no choice, we have to start a transaction before
// we create the prepared statement, otherwise every executed
// statement will get committed after the prepared statement
// gets finalized, see http://www.sqlite.org/lang_transaction.html
db.setRestorePoint();
//Accept multi-line queries, by looping until the tail is empty
do
@@ -777,12 +784,6 @@ void MainWindow::executeQuery()
queryResultListModel->setHorizontalHeaderLabels(QStringList());
queryResultListModel->setVerticalHeaderLabels(QStringList());
// there is no choice, we have to start a transaction before
// we create the prepared statement, otherwise every executed
// statement will get committed after the prepared statement
// gets finalized, see http://www.sqlite.org/lang_transaction.html
db.setRestorePoint();
const char* qbegin = tail;
sql3status = sqlite3_prepare_v2(db._db,tail,utf8Query.length(),
&vm, &tail);
@@ -848,7 +849,7 @@ void MainWindow::executeQuery()
} while( tail && *tail != 0 && (sql3status == SQLITE_OK || sql3status == SQLITE_DONE));
if(!modified)
if(!modified && !wasdirty)
db.revert(); // better rollback, if the logic is not enough we can tune it.
}