Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/cut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,16 @@ int main(
return 1;
}

auto &query_plan = overall_query_plan->get_plans().back();
query_plan.select.emplace(
query_plan.select->get_tablenames(),
auto &select = overall_query_plan->get_plans().back();
if (!select.select.has_value()) {
std::cerr << "No SELECT fragment in final query plan.\n";
return 1;
}

select.select.emplace(
select.select->get_tablenames(),
options.get_fields(),
query_plan.select->get_alias()
select.select->get_alias()
);

return static_cast<int>(dump_or_eval_query_plan(*overall_query_plan));
Expand Down
6 changes: 3 additions & 3 deletions src/eval.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class EvalOptions final : public Options {

bool parse(
const int argc,
const char *argv[]
) override { // NOLINT(*-avoid-c-arrays)
const char *argv[] // NOLINT(*-avoid-c-arrays)
) override {
if (bool const parent_result = Options::parse(argc, argv); !parent_result) {
return parent_result;
}
Expand Down Expand Up @@ -137,7 +137,7 @@ int main(
}
const auto [query_str, query_params] = *query;
std::cout << query_str << '\n';
for (const auto &[column, value] : query_params) {
for (const auto &[column, value]: query_params) {
std::cout << "-- Colum " << column << ": " << value << '\n';
}
return static_cast<int>(ExitStatus::SUCCESS);
Expand Down
4 changes: 2 additions & 2 deletions src/grep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class GrepOptions final : public Options {

bool parse(
const int argc,
const char *argv[]
) override { // NOLINT(*-avoid-c-arrays)
const char *argv[] // NOLINT(*-avoid-c-arrays)
) override {
if (bool const parent_result = Options::parse(argc, argv); !parent_result) {
return parent_result;
}
Expand Down
4 changes: 2 additions & 2 deletions src/head.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class HeadOptions final : public Options {

bool parse(
const int argc,
const char *argv[]
) override { // NOLINT(*-avoid-c-arrays)
const char *argv[] // NOLINT(*-avoid-c-arrays)
) override {
if (bool const parent_result = Options::parse(argc, argv); !parent_result) {
return parent_result;
}
Expand Down
7 changes: 4 additions & 3 deletions src/join.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <algorithm>
#include <string>

#include <boost/program_options.hpp>
Expand Down Expand Up @@ -61,7 +62,7 @@ class JoinOptions final : public Options {
void parse_option_switches(
std::vector<JoinCondition> &conditions
) const {
const auto num_args = std::min(left_.size(), std::min(right_.size(), predicate_.size()));
const auto num_args = std::min({left_.size(), right_.size(), predicate_.size()});
if (left_.size() != num_args || right_.size() != num_args || predicate_.size() != num_args) {
std::cerr << "Number of left, right and predicate arguments must be the same. Got " << left_.size() << ", "
<< right_.size() << " and " << predicate_.size() << ". Using the first " << num_args << "\n";
Expand All @@ -84,8 +85,8 @@ class JoinOptions final : public Options {
conditions.push_back(
JoinCondition{
.left = positional_args_[i * 3],
.predicate = positional_args_[i * 3 + 1],
.right = positional_args_[i * 3 + 2]
.predicate = positional_args_[(i * 3) + 1],
.right = positional_args_[(i * 3) + 2]
}
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class Options {

virtual bool parse(
const int argc,
const char *argv[]
) { // NOLINT(*-avoid-c-arrays)
const char *argv[] // NOLINT(*-avoid-c-arrays)
) {
namespace po = boost::program_options;

try {
Expand Down
Loading