summaryrefslogtreecommitdiff
path: root/project2/sql
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2011-11-29 13:22:48 +0000
committerrandomdan <randomdan@localhost>2011-11-29 13:22:48 +0000
commitbc09819f292fcb9ba051bc06c9683ba75fe9494f (patch)
tree3a1c5ed7fbe6fd838ddae64e2575e9f08c22bf1f /project2/sql
parentSerialize JSON objects to a stream, removes need to temp string in transform (diff)
downloadproject2-bc09819f292fcb9ba051bc06c9683ba75fe9494f.tar.bz2
project2-bc09819f292fcb9ba051bc06c9683ba75fe9494f.tar.xz
project2-bc09819f292fcb9ba051bc06c9683ba75fe9494f.zip
Allow specifying different loader classes when setting up script parsers (allows defining presenter modules from within a script)
Diffstat (limited to 'project2/sql')
-rw-r--r--project2/sql/sqlMergeTask.cpp2
-rw-r--r--project2/sql/sqlTask.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp
index f98d57e..96a895a 100644
--- a/project2/sql/sqlMergeTask.cpp
+++ b/project2/sql/sqlMergeTask.cpp
@@ -58,7 +58,7 @@ SqlMergeTask::SqlMergeTask(const xmlpp::Element * p) :
dtablet(stringf("tmp_%s_%d", dtable.c_str(), getpid()))
{
LoaderBase loader(true);
- loader.supportedStorers.insert(Storer::into(&sources));
+ loader.supportedStorers.insert(Storer::into<ElementLoader>(&sources));
loader.collectAll(p, true);
if (!sources.empty() && useView()) {
diff --git a/project2/sql/sqlTask.cpp b/project2/sql/sqlTask.cpp
index 63f73a9..9f881de 100644
--- a/project2/sql/sqlTask.cpp
+++ b/project2/sql/sqlTask.cpp
@@ -10,7 +10,7 @@
DECLARE_LOADER("sqltask", SqlTask);
StaticMessageException(RunOnNotSpecified, "runon attribute must be specified");
-class SqlIfChangesStorer : public StorerBase<NoOutputExecute, ANONORDEREDSTORAGEOF(NoOutputExecute)> {
+class SqlIfChangesStorer : public StorerBase<NoOutputExecute, ANONORDEREDSTORAGEOF(NoOutputExecute), ElementLoader> {
public:
SqlIfChangesStorer(Map c, Map nc) :
changes(c),