summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2013-12-08 15:54:52 +0000
committerrandomdan <randomdan@localhost>2013-12-08 15:54:52 +0000
commit7bfa5491b216900ffb3c62c7ac8a4a64f4ec4f4b (patch)
tree25a2cceaf112a01b9288b40f275f84acb9e1ff38
parentChange signal handling to be more helpful and proper (diff)
downloadproject2-7bfa5491b216900ffb3c62c7ac8a4a64f4ec4f4b.tar.bz2
project2-7bfa5491b216900ffb3c62c7ac8a4a64f4ec4f4b.tar.xz
project2-7bfa5491b216900ffb3c62c7ac8a4a64f4ec4f4b.zip
Add savepoint support to core DB connector
Add a savepoint wrapper around sql merge
-rw-r--r--project2/sql/sqlMergeTask.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp
index d4e22c7..4356279 100644
--- a/project2/sql/sqlMergeTask.cpp
+++ b/project2/sql/sqlMergeTask.cpp
@@ -6,6 +6,7 @@
#include "exceptions.h"
#include "sqlVariableBinder.h"
#include "scriptLoader.h"
+#include "scopeObject.h"
#include <misc.h>
#include <stdio.h>
#include <stdexcept>
@@ -161,6 +162,11 @@ class MergeWhere : public TablePatch::WhereProvider {
void
SqlMergeTask::execute(ExecContext * ec) const
{
+ auto savepoint(stringf("sqlmerge_savepoint_%p", this));
+ destdb->savepoint(savepoint);
+ ScopeObject SPHandler(NULL,
+ boost::bind(&DB::Connection::releaseSavepoint, destdb, savepoint),
+ boost::bind(&DB::Connection::rollbackToSavepoint, destdb, savepoint));
createTempTable();
if (earlyKeys(NULL)) {
createTempKey();