Remove NoOutputExecute for not being a thing

3 files changed, 11 insertions, 10 deletions

diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp
index b6c504f..ea334eb 100644
--- a/project2/sql/sqlMergeTask.cpp
+++ b/project2/sql/sqlMergeTask.cpp
@@ -46,7 +46,7 @@ DECLARE_LOADER("sqlmergeinsert", SqlMergeInsert);
 // Conversion logic
 SqlMergeTask::SqlMergeTask(const std::string & datasource, const std::string & target) :
 	SourceObject(__PRETTY_FUNCTION__),
-	Task(NULL),
+	Task(__PRETTY_FUNCTION__),
 	insteadOfDelete(NULL),
 	updateWhere(NULL),
 	patchOrder(NULL),
@@ -265,11 +265,11 @@ SqlMergeTask::insertCommand() const
 	return destdb->newModifyCommand(ins);
 }
 
-class Populate : public NoOutputExecute {
+class Populate : public Task {
 	public:
 		Populate(DB::ModifyCommand * c) :
 			SourceObject(__FUNCTION__),
-			NoOutputExecute(__FUNCTION__),
+			Task(__FUNCTION__),
 			cmd(c)
 		{
 		}
diff --git a/project2/sql/sqlTask.cpp b/project2/sql/sqlTask.cpp
index a98748f..94f5102 100644
--- a/project2/sql/sqlTask.cpp
+++ b/project2/sql/sqlTask.cpp
@@ -17,8 +17,8 @@ SqlTask::SqlTask(ScriptNodePtr p) :
 	sqlCommand(p->child("sql")),
 	db(NULL)
 {
-	p->script->loader.addLoadTargetSub(p, "changes", false, Storer::into<ElementLoader>(&changesNOEs));
-	p->script->loader.addLoadTargetSub(p, "nochanges", false, Storer::into<ElementLoader>(&noChangesNOEs));
+	p->script->loader.addLoadTargetSub(p, "changes", false, Storer::into<ElementLoader>(&changesTasks));
+	p->script->loader.addLoadTargetSub(p, "nochanges", false, Storer::into<ElementLoader>(&noChangesTasks));
 }
 
 SqlTask::~SqlTask()
@@ -40,12 +40,12 @@ SqlTask::execute(ExecContext * ec) const
 	unsigned int offset = 0;
 	sqlCommand.bindParams(ec, modify.get(), offset);
 	if (modify->execute() == 0) {
-		for (const SubNOEs::value_type & sq : noChangesNOEs) {
+		for (const auto & sq : noChangesTasks) {
 			sq->execute(ec);
 		}
 	}
 	else {
-		for (const SubNOEs::value_type & sq : changesNOEs) {
+		for (const auto & sq : changesTasks) {
 			sq->execute(ec);
 		}
 	}
diff --git a/project2/sql/sqlTask.h b/project2/sql/sqlTask.h
index 94901a9..20f7415 100644
--- a/project2/sql/sqlTask.h
+++ b/project2/sql/sqlTask.h
@@ -6,6 +6,7 @@
 #include "task.h"
 #include "variables.h"
 #include "sqlWriter.h"
+#include <scriptStorage.h>
 
 namespace DB { class ModifyCommand; }
 class RdbmsDataSource;
@@ -21,9 +22,9 @@ class SqlTask : public Task {
 		const Variable dataSource;
 		const Variable filter;
 
-		typedef ANONORDEREDSTORAGEOF(NoOutputExecute) SubNOEs;
-		SubNOEs changesNOEs;
-		SubNOEs noChangesNOEs;
+		typedef ANONORDEREDSTORAGEOF(Task) SubTasks;
+		SubTasks changesTasks;
+		SubTasks noChangesTasks;
 
 	protected:
 		const DynamicSql::SqlCommand sqlCommand;