Move accept_csv_option to struct CsvOptions

Author: Greenscreen23

src/parser/bison_parser.cpp

@@ -3721,7 +3721,7 @@ YYLTYPE yylloc = yyloc_default;
     (yyvsp[-2].import_export_option_t)->csv_options = new CsvOptions{};
   }
 
-  if (!(yyvsp[-2].import_export_option_t)->accept_csv_option((yyvsp[0].csv_option_t))) {
+  if (!(yyvsp[-2].import_export_option_t)->csv_options->accept_csv_option((yyvsp[0].csv_option_t))) {
     free((yyvsp[0].csv_option_t)->second);
     delete (yyvsp[0].csv_option_t);
     delete (yyvsp[-2].import_export_option_t);
@@ -3740,7 +3740,7 @@ YYLTYPE yylloc = yyloc_default;
              {
   (yyval.import_export_option_t) = new ImportExportOptions{};
   (yyval.import_export_option_t)->csv_options = new CsvOptions{};
-  (yyval.import_export_option_t)->accept_csv_option((yyvsp[0].csv_option_t));
+  (yyval.import_export_option_t)->csv_options->accept_csv_option((yyvsp[0].csv_option_t));
 
   delete (yyvsp[0].csv_option_t);
 }

src/parser/bison_parser.y

@@ -545,7 +545,7 @@ import_export_options : import_export_options ',' FORMAT file_type {
     $1->csv_options = new CsvOptions{};
   }
 
-  if (!$1->accept_csv_option($3)) {
+  if (!$1->csv_options->accept_csv_option($3)) {
     free($3->second);
     delete $3;
     delete $1;
@@ -559,7 +559,7 @@ import_export_options : import_export_options ',' FORMAT file_type {
 | csv_option {
   $$ = new ImportExportOptions{};
   $$->csv_options = new CsvOptions{};
-  $$->accept_csv_option($1);
+  $$->csv_options->accept_csv_option($1);
 
   delete $1;
 }

src/sql/ImportExportOptions.h

@@ -28,6 +28,8 @@ struct CsvOptions {
   char* delimiter;
   char* null;
   char* quote;
+
+  bool accept_csv_option(std::pair<CsvOptionType, char*>* option);
 };
 
 struct ImportExportOptions {
@@ -37,8 +39,6 @@ struct ImportExportOptions {
   ImportType format;
   char* encoding;
   CsvOptions* csv_options;
-
-  bool accept_csv_option(std::pair<CsvOptionType, char*>* option);
 };
 
 }  // namespace hsql

src/sql/statements.cpp

@@ -159,32 +159,32 @@ CsvOptions::~CsvOptions() {
   free(quote);
 }
 
-ImportExportOptions::ImportExportOptions() : format(kImportAuto), encoding(nullptr), csv_options(nullptr) {}
-
-ImportExportOptions::~ImportExportOptions() {
-  free(encoding);
-  delete csv_options;
-}
-
-bool ImportExportOptions::accept_csv_option(std::pair<CsvOptionType, char*>* option) {
+bool CsvOptions::accept_csv_option(std::pair<CsvOptionType, char*>* option) {
   switch (option->first) {
     case CsvOptionType::Delimiter:
-      if (csv_options->delimiter != nullptr) return false;
-      csv_options->delimiter = option->second;
+      if (delimiter != nullptr) return false;
+      delimiter = option->second;
       break;
     case CsvOptionType::Null:
-      if (csv_options->null != nullptr) return false;
-      csv_options->null = option->second;
+      if (null != nullptr) return false;
+      null = option->second;
       break;
     case CsvOptionType::Quote:
-      if (csv_options->quote != nullptr) return false;
-      csv_options->quote = option->second;
+      if (quote != nullptr) return false;
+      quote = option->second;
       break;
   }
 
   return true;
 }
 
+ImportExportOptions::ImportExportOptions() : format(kImportAuto), encoding(nullptr), csv_options(nullptr) {}
+
+ImportExportOptions::~ImportExportOptions() {
+  free(encoding);
+  delete csv_options;
+}
+
 // ImportStatement
 ImportStatement::ImportStatement(ImportType type)
     : SQLStatement(kStmtImport),