summaryrefslogtreecommitdiff
path: root/project2/sqlMergeTask.h
diff options
context:
space:
mode:
Diffstat (limited to 'project2/sqlMergeTask.h')
-rw-r--r--project2/sqlMergeTask.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/project2/sqlMergeTask.h b/project2/sqlMergeTask.h
index 61cbe4e..968e284 100644
--- a/project2/sqlMergeTask.h
+++ b/project2/sqlMergeTask.h
@@ -8,6 +8,7 @@
#include "tablepatch.h"
#include "task.h"
#include "iterate.h"
+#include "variables.h"
#include <string>
#include <set>
#include <map>
@@ -43,7 +44,7 @@ class _SqlMergeTask : public _Task {
Columns cols;
Keys keys;
Keys indexes;
- const std::string updateWhere;
+ const Variable updateWhere;
const std::string patchOrder;
bool earlyKeys;
@@ -58,6 +59,7 @@ class _SqlMergeTask : public _Task {
std::list<std::string> sqls;
protected:
ModifyCommand * insertCommand() const;
+ ModifyCommand * insCmd;
public:
mutable ODBC::Connection * destdb;