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

Merge pull request #895 from prutz1311/master

Browse Source 
Improve handling of SQLite savepoints (#878) (#836)
This commit is contained in:
Justin Clift
2016-12-10 11:41:34 +00:00
committed by GitHub
parent 4ac931835d 2f45341570
commit e6a8f88255
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sqlitedb.cpp
View File

@@ -284,13 +284,22 @@ bool DBBrowserDB::setSavepoint(const QString& pointname)
bool DBBrowserDB::releaseSavepoint(const QString& pointname)
{
if(!isOpen() || savepointList.contains(pointname) == false)
if(!isOpen())
return false;
if(savepointList.contains(pointname) == false)
// If there is no such savepoint in the list,
// we have already released it, so in this case
// the operation should be successfull
return true;
QString query = QString("RELEASE %1;").arg(pointname);
if(!executeSQL(query, false, false))
return false;
savepointList.removeAll(pointname);
// SQLite releases all savepoints that were created between
// creation of given savepoint and releasing of it,
// so we should too
int point_index = savepointList.lastIndexOf(pointname);
savepointList.erase(savepointList.begin()+point_index, savepointList.end());
emit dbChanged(getDirty());
return true;
@@ -305,7 +314,11 @@ bool DBBrowserDB::revertToSavepoint(const QString& pointname)
executeSQL(query, false, false);
query = QString("RELEASE %1;").arg(pointname);
executeSQL(query, false, false);
savepointList.removeAll(pointname);
// SQLite releases all savepoints that were created between
// creation of given savepoint and releasing of it,
// so we should too
int point_index = savepointList.lastIndexOf(pointname);
savepointList.erase(savepointList.begin()+point_index, savepointList.end());
emit dbChanged(getDirty());
return true;