Implemented first insert version

Author: sea5kg

src/tests/test_insert.cpp

@@ -30,22 +30,28 @@
 
 int main() {
     WsjcppSqlBuilder builder;
-    builder.insertInto("table1");
+    builder.insertInto("table2")
+        .colum("col1")
+        .addColums({"col2", "col3"})
+        .val("val1")
+        .val(1)
+        .val(2.0)
+    ;
 
     if (builder.hasErrors()) {
         std::cerr << "Select builder has some errors" << std::endl;
         return -1;
     }
-    // std::string sqlQuery = builder.sql();
-    // std::string sqlQueryExpected = "INSERT INTO TABLE_NAME(COL1, COL2) VALUES ('val1', 1);";
-    // if (sqlQuery != sqlQueryExpected) {
-    //     std::cerr
-    //         << "Expected:" << std::endl
-    //         << "   " << sqlQueryExpected << std::endl
-    //         << ", but got:" << std::endl
-    //         << "   " << sqlQuery << std::endl
-    //     ;
-    //     return -1;
-    // }
+    std::string sqlQuery = builder.sql();
+    std::string sqlQueryExpected = "INSERT INTO table2(col1, col2, col3) VALUES('val1', 1, 2.000000)";
+    if (sqlQuery != sqlQueryExpected) {
+        std::cerr
+            << "Expected:" << std::endl
+            << "   {" << sqlQueryExpected << "}" << std::endl
+            << ", but got:" << std::endl
+            << "   {" << sqlQuery << "}" << std::endl
+        ;
+        return -1;
+    }
     return 0;
 }

src/wsjcpp_sql_builder.cpp

@@ -248,28 +248,79 @@ WsjcppSqlInsert::WsjcppSqlInsert(const std::string &tableName, WsjcppSqlBuilder
 
 }
 
+WsjcppSqlInsert &WsjcppSqlInsert::colum(const std::string &col) {
+  m_columns.push_back(col);
+  return *this;
+}
+
+WsjcppSqlInsert &WsjcppSqlInsert::addColums(const std::vector<std::string> &cols) {
+  for (auto col : cols) {
+    m_columns.push_back(col);
+  }
+  return *this;
+}
+
+WsjcppSqlInsert &WsjcppSqlInsert::val(const std::string &val) {
+  m_values.push_back(WsjcppSqlBuilderHelpers::escapingStringValue(val));
+  return *this;
+}
+
+WsjcppSqlInsert &WsjcppSqlInsert::val(int val) {
+  m_values.push_back(std::to_string(val));
+  return *this;
+}
+
+WsjcppSqlInsert &WsjcppSqlInsert::val(float val) {
+  m_values.push_back(std::to_string(val));
+  return *this;
+}
+
+WsjcppSqlInsert &WsjcppSqlInsert::val(double val) {
+  m_values.push_back(std::to_string(val));
+  return *this;
+}
 
 std::string WsjcppSqlInsert::sql() {
   std::string ret = "INSERT INTO " + tableName();
 
+  // TODO if columns is empty
+  ret += "(";
+  bool first = true;
+  for (auto col : m_columns) {
+    if (!first) {
+      ret += ", ";
+    }
+    ret += col;
+    first = false;
+  }
+  ret += ")";
+
+  ret += " VALUES(";
+  first = true;
+  for (auto val : m_values) {
+    if (!first) {
+      ret += ", ";
+    }
+    ret += val;
+    first = false;
+  }
+  ret += ")";
+
   return ret;
 };
 
 // ---------------------------------------------------------------------
 // WsjcppSqlBuilder
 
 WsjcppSqlSelect &WsjcppSqlBuilder::selectFrom(const std::string &tableName) {
-  m_tableName = tableName;
-  m_nSqlType = WsjcppSqlQueryType::SELECT;
-  m_queries.push_back(std::make_shared<WsjcppSqlSelect>(m_tableName, this));
+  m_queries.push_back(std::make_shared<WsjcppSqlSelect>(tableName, this));
   // TODO check must be select last one;
   return *(WsjcppSqlSelect *)(m_queries[m_queries.size() -1].get());
 }
 
-WsjcppSqlBuilder &WsjcppSqlBuilder::insertInto(const std::string &tableName) {
-  m_tableName = tableName;
-  m_nSqlType = WsjcppSqlQueryType::INSERT;
-  return *this;
+WsjcppSqlInsert &WsjcppSqlBuilder::insertInto(const std::string &tableName) {
+  m_queries.push_back(std::make_shared<WsjcppSqlInsert>(tableName, this));
+  return *(WsjcppSqlInsert *)(m_queries[m_queries.size() -1].get());;
 }
 
 // WsjcppSqlBuilder &WsjcppSqlBuilder::makeUpdate(const std::string &tableName) {

src/wsjcpp_sql_builder.h

@@ -239,22 +239,28 @@ class WsjcppSqlSelect : public WsjcppSqlQuery {
 class WsjcppSqlInsert : public WsjcppSqlQuery {
 public:
   WsjcppSqlInsert(const std::string &tableName, WsjcppSqlBuilder *builder);
-  // WsjcppSqlInsert &colum(const std::string &col);
+  WsjcppSqlInsert &colum(const std::string &col);
+  WsjcppSqlInsert &addColums(const std::vector<std::string> &cols);
+
+  WsjcppSqlInsert &val(const std::string &col);
+  WsjcppSqlInsert &val(int col);
+  WsjcppSqlInsert &val(float col);
+  WsjcppSqlInsert &val(double col);
 
   WsjcppSqlBuilder &builder();
   virtual std::string sql() override;
 
 private:
   std::vector<std::string> m_columns;
-  std::map<std::string, std::string> m_columns_as;
+  std::vector<std::string> m_values;
 };
 
 class WsjcppSqlBuilder {
 public:
   // TODO begin / end transaction can be added here
 
   WsjcppSqlSelect &selectFrom(const std::string &tableName);
-  WsjcppSqlBuilder &insertInto(const std::string &tableName);
+  WsjcppSqlInsert &insertInto(const std::string &tableName);
   // WsjcppSqlBuilder &update(const std::string &sSqlTable);
   // WsjcppSqlBuilder &deleteFrom(const std::string &sSqlTable);
 
@@ -269,7 +275,5 @@ class WsjcppSqlBuilder {
 
 private:
   std::vector<std::string> m_errors;
-  std::string m_tableName;
-  WsjcppSqlQueryType m_nSqlType;
   std::vector<std::shared_ptr<WsjcppSqlQuery>> m_queries;
 };