Prepare update query

Author: sea5kg

src/tests/test_update.cpp

@@ -0,0 +1,68 @@
+/**********************************************************************************
+ * MIT License
+ *
+ * Copyright (c) 2025-2026 Evgenii Sopov <mrseakg@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ *all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Official Source Code: https://github.com/wsjcpp/wsjcpp-sql-builder
+ *
+ ***********************************************************************************/
+
+#include <iostream>
+#include <wsjcpp_sql_builder.h>
+
+int main() {
+    WsjcppSqlBuilder builder;
+    builder.update("table3")
+      .set("col1", "val uuu")
+      .set("col2", 1)
+      .set("col3", 1.000)
+      .where()
+        .equal("col1", "1")
+        .or_()
+        .notEqual("col2", "2")
+        .or_()
+        .subCondition()
+          .equal("c3", "4")
+          // .and_() // be default must be added and
+          .equal("col2", "5")
+        .finishSubCondition()
+        .or_()
+        .lessThen("col4", 111)
+    ;
+
+    if (builder.hasErrors()) {
+        std::cerr << "Select builder has some errors" << std::endl;
+        return -1;
+    }
+    std::string sqlQuery = builder.sql();
+    std::string sqlQueryExpected = "UPDATE table3 SET col1 = 'val uuu', col2 = 1, col3 = 1.000000 WHERE col1 = '1' OR col2 <> '2' OR (c3 = '4' AND col2 = '5') OR col4 < 111";
+    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

@@ -205,7 +205,6 @@ WsjcppSqlWhere<WsjcppSqlSelect> &WsjcppSqlSelect::where() {
   if (!m_where) {
     m_where = std::make_shared<WsjcppSqlWhere<WsjcppSqlSelect>>(nullptr, builderRawPtr(), this);
   }
-
   return *(m_where.get());
 }
 
@@ -314,6 +313,70 @@ std::string WsjcppSqlInsert::sql() {
   return ret;
 };
 
+// ---------------------------------------------------------------------
+// WsjcppSqlUpdate
+
+WsjcppSqlUpdate::WsjcppSqlUpdate(const std::string &tableName, WsjcppSqlBuilder *builder)
+  : WsjcppSqlQuery(WsjcppSqlQueryType::INSERT, builder, tableName) {
+
+}
+
+WsjcppSqlUpdate &WsjcppSqlUpdate::set(const std::string &name, const std::string &val) {
+  return setValue(name, WsjcppSqlBuilderHelpers::escapingStringValue(val));
+}
+
+WsjcppSqlUpdate &WsjcppSqlUpdate::set(const std::string &name, int val) {
+  return setValue(name, std::to_string(val));
+}
+
+WsjcppSqlUpdate &WsjcppSqlUpdate::set(const std::string &name, float val) {
+  return setValue(name, std::to_string(val));
+}
+
+WsjcppSqlUpdate &WsjcppSqlUpdate::set(const std::string &name, double val) {
+  return setValue(name, std::to_string(val));
+}
+
+WsjcppSqlUpdate &WsjcppSqlUpdate::setValue(const std::string &name, const std::string &val) {
+  auto it = std::find(m_columns.begin(), m_columns.end(), name);
+  if (it != m_columns.end()) {
+    m_values[name] = val;
+    // builder().addError("Column '" + name + "' already added to select");
+  } else {
+    m_columns.push_back(name);
+    m_values[name] = val;
+  }
+  return *this;
+}
+
+WsjcppSqlWhere<WsjcppSqlUpdate> &WsjcppSqlUpdate::where() {
+  if (!m_where) {
+    m_where = std::make_shared<WsjcppSqlWhere<WsjcppSqlUpdate>>(nullptr, builderRawPtr(), this);
+  }
+  return *(m_where.get());
+}
+
+std::string WsjcppSqlUpdate::sql() {
+  std::string ret = "UPDATE " + tableName() + " SET ";
+
+  // TODO if columns is empty
+  bool first = true;
+  for (auto col : m_columns) {
+    if (!first) {
+      ret += ", ";
+    }
+    ret += col + " = " + m_values[col];
+    first = false;
+  }
+
+  if (m_where) {
+    ret += " WHERE " + m_where->sql();
+  }
+
+  return ret;
+};
+
+
 // ---------------------------------------------------------------------
 // WsjcppSqlBuilder
 
@@ -337,11 +400,19 @@ WsjcppSqlInsert &WsjcppSqlBuilder::findInsertOrCreate(const std::string &tableNa
   return insertInto(tableName);
 }
 
-// WsjcppSqlBuilder &WsjcppSqlBuilder::makeUpdate(const std::string &tableName) {
-//   m_tableName = tableName;
-//   m_nSqlType = WsjcppSqlQueryType::UPDATE;
-//   return *this;
-// }
+WsjcppSqlUpdate &WsjcppSqlBuilder::update(const std::string &tableName) {
+  m_queries.push_back(std::make_shared<WsjcppSqlUpdate>(tableName, this));
+  return *(WsjcppSqlUpdate *)(m_queries[m_queries.size() -1].get());
+}
+
+WsjcppSqlUpdate &WsjcppSqlBuilder::findUpdateOrCreate(const std::string &tableName) {
+  for (auto query : m_queries) {
+    if (query->sqlType() == WsjcppSqlQueryType::UPDATE && query->tableName() == tableName) {
+      return *(WsjcppSqlUpdate *)(query.get());
+    }
+  }
+  return update(tableName);
+}
 
 // WsjcppSqlBuilder &WsjcppSqlBuilder::makeDelete(const std::string &tableName) {
 //   m_tableName = tableName;

src/wsjcpp_sql_builder.h

@@ -243,27 +243,48 @@ class WsjcppSqlInsert : public WsjcppSqlQuery {
   WsjcppSqlInsert &addColums(const std::vector<std::string> &cols);
   WsjcppSqlInsert &clearValues();
 
-  WsjcppSqlInsert &val(const std::string &col);
-  WsjcppSqlInsert &val(int col);
-  WsjcppSqlInsert &val(float col);
-  WsjcppSqlInsert &val(double col);
+  WsjcppSqlInsert &val(const std::string &val);
+  WsjcppSqlInsert &val(int val);
+  WsjcppSqlInsert &val(float val);
+  WsjcppSqlInsert &val(double val);
 
-  WsjcppSqlBuilder &builder();
   virtual std::string sql() override;
 
 private:
   std::vector<std::string> m_columns;
   std::vector<std::string> m_values;
 };
 
+class WsjcppSqlUpdate : public WsjcppSqlQuery {
+public:
+  WsjcppSqlUpdate(const std::string &tableName, WsjcppSqlBuilder *builder);
+
+  WsjcppSqlUpdate &set(const std::string &name, const std::string &val);
+  WsjcppSqlUpdate &set(const std::string &name, int val);
+  WsjcppSqlUpdate &set(const std::string &name, float val);
+  WsjcppSqlUpdate &set(const std::string &name, double val);
+
+  WsjcppSqlWhere<WsjcppSqlUpdate> &where();
+
+  virtual std::string sql() override;
+
+private:
+  WsjcppSqlUpdate &setValue(const std::string &name, const std::string &val);
+
+  std::shared_ptr<WsjcppSqlWhere<WsjcppSqlUpdate>> m_where;
+  std::vector<std::string> m_columns;
+  std::map<std::string, std::string> m_values;
+};
+
 class WsjcppSqlBuilder {
 public:
   // TODO begin / end transaction can be added here
 
   WsjcppSqlSelect &selectFrom(const std::string &tableName);
   WsjcppSqlInsert &insertInto(const std::string &tableName);
   WsjcppSqlInsert &findInsertOrCreate(const std::string &tableName);
-  // WsjcppSqlBuilder &update(const std::string &sSqlTable);
+  WsjcppSqlUpdate &update(const std::string &tableName);
+  WsjcppSqlUpdate &findUpdateOrCreate(const std::string &tableName);
   // WsjcppSqlBuilder &deleteFrom(const std::string &sSqlTable);
 
   bool hasErrors();
@@ -272,6 +293,8 @@ class WsjcppSqlBuilder {
 
 protected:
   friend WsjcppSqlSelect;
+  friend WsjcppSqlInsert;
+  friend WsjcppSqlUpdate;
   friend WsjcppSqlWhere<WsjcppSqlSelect>;
   void addError(const std::string &err);