diff -r 3c6374467a82 -r c22577615ce4 src/CLIParser.h --- a/src/CLIParser.h Thu Sep 24 18:57:20 2020 +0200 +++ b/src/CLIParser.h Wed Oct 07 16:42:37 2020 +0200 @@ -42,9 +42,9 @@ c.relationConfigurations.push_back(currentRelation); } else { // no relation name given → global configuration - c.printTypes = currentRelation.printTypes; - c.printRelationName = currentRelation.printRelationName; - c.printRecordCount = currentRelation.printRecordCount; + c.writeTypes = currentRelation.writeTypes; + c.writeRelationName = currentRelation.writeRelationName; + c.writeRecordCount = currentRelation.writeRecordCount; } currentRelation = RelationConfiguration(); } @@ -61,9 +61,9 @@ public: static const relpipe::reader::string_t OPTION_RELATION; - static const relpipe::reader::string_t OPTION_PRINT_TYPES; - static const relpipe::reader::string_t OPTION_PRINT_RELATION_NAME; - static const relpipe::reader::string_t OPTION_PRINT_RECORD_COUNT; + static const relpipe::reader::string_t OPTION_WRITE_TYPES; + static const relpipe::reader::string_t OPTION_WRITE_RELATION_NAME; + static const relpipe::reader::string_t OPTION_WRITE_RECORD_COUNT; Configuration parse(const std::vector& arguments) { Configuration c; @@ -75,12 +75,12 @@ if (option == OPTION_RELATION) { addRelation(c, currentRelation); // previous relation currentRelation.relation = readNext(arguments, i); - } else if (option == OPTION_PRINT_TYPES) { - currentRelation.printTypes = parseBoolean(readNext(arguments, i)); - } else if (option == OPTION_PRINT_RELATION_NAME) { - currentRelation.printRelationName = parseBoolean(readNext(arguments, i)); - } else if (option == OPTION_PRINT_RECORD_COUNT) { - currentRelation.printRecordCount = parseBoolean(readNext(arguments, i)); + } else if (option == OPTION_WRITE_TYPES) { + currentRelation.writeTypes = parseBoolean(readNext(arguments, i)); + } else if (option == OPTION_WRITE_RELATION_NAME) { + currentRelation.writeRelationName = parseBoolean(readNext(arguments, i)); + } else if (option == OPTION_WRITE_RECORD_COUNT) { + currentRelation.writeRecordCount = parseBoolean(readNext(arguments, i)); } else throw relpipe::cli::RelpipeCLIException(L"Unsupported CLI option: " + option, relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS); } @@ -94,9 +94,9 @@ }; const relpipe::reader::string_t CLIParser::OPTION_RELATION = L"--relation"; -const relpipe::reader::string_t CLIParser::OPTION_PRINT_TYPES = L"--print-types"; -const relpipe::reader::string_t CLIParser::OPTION_PRINT_RELATION_NAME = L"--print-relation-name"; -const relpipe::reader::string_t CLIParser::OPTION_PRINT_RECORD_COUNT = L"--print-record-count"; +const relpipe::reader::string_t CLIParser::OPTION_WRITE_TYPES = L"--write-types"; +const relpipe::reader::string_t CLIParser::OPTION_WRITE_RELATION_NAME = L"--write-relation-name"; +const relpipe::reader::string_t CLIParser::OPTION_WRITE_RECORD_COUNT = L"--write-record-count"; } }