fix query tests (9e6f1410) · Commits · github_fork / Clip

src/query/query.cc

+5 −3

Original line number	Diff line number	Diff line
		@@ -42,9 +42,11 @@ Query::Query(const char* query_string, query::TableRepository* repo) {

		void Query::execute() {
		for (const auto& stmt : statements_) {
		//target->addHeader(stmt->getColumns());
		//stmt->setTarget(target);
		//stmt->execute();
		auto target = new ResultList();
		target->addHeader(stmt->getColumns());
		stmt->setTarget(target);
		stmt->execute();
		results_.emplace_back(target);
		}
		}

+1 −1

+9 −5

Original line number	Diff line number	Diff line
		@@ -15,11 +15,7 @@
		namespace fnordmetric {
		namespace query {

		class AbstractResultList {

		};

		class ResultList : public AbstractResultList {
		class ResultList : public RowSink {
		public:
		ResultList() {}
		ResultList(const ResultList& copy) = delete;
		@@ -58,6 +54,14 @@ public:
		rows_.back().push_back(value);
		}

		bool nextRow(query::SValue* row, int row_len) override {
		addRow();
		for (int i = 0; i < row_len; ++i) {
		addColumn(row[i].toString());
		}
		return true;
		}

		void debugPrint() const {
		std::vector<int> col_widths;
		int total_width = 0;