Implemented subCondition

Author: sea5kg

src/tests/test_select.cpp

@@ -34,18 +34,29 @@ int main() {
     .colum("col1")
     .colum("col2", "c3")
     .colum("col3")
+    .colum("col4")
     .where()
       .equal("col1", "1")
       .or_()
       .notEqual("col2", "2")
-    .endWhere()
-    // .groupBy()
+      .or_()
+      .subCondition()
+        .equal("c3", "4")
+        // .and_() // be default must be added and
+        .equal("col2", "5")
+      .finishSubCondition()
+      .or_()
+      .lessThen("col4", "...")
+    .endWhere() // need only for groupBy havingBy and etc
   ;
   if (builder.hasErrors()) {
     return -1;
   }
   std::string sqlQuery = builder.sql();
-  std::string sqlQueryExpected = "SELECT col1, col2 AS c3, col3 FROM table1 WHERE col1 = \"1\" OR col2 <> \"2\"";
+  std::string sqlQueryExpected =
+    "SELECT col1, col2 AS c3, col3, col4 "
+    "FROM table1 "
+    "WHERE col1 = \"1\" OR col2 <> \"2\" OR (c3 = \"4\" AND col2 = \"5\") OR col4 < \"...\"";
   if (sqlQuery != sqlQueryExpected) {
     std::cerr
       << "Expected:" << std::endl

src/wsjcpp_sql_builder.cpp

@@ -387,7 +387,7 @@ WsjcppSqlSelect &WsjcppSqlSelect::colum(const std::string &col, const std::strin
 
 WsjcppSqlWhere<WsjcppSqlSelect> &WsjcppSqlSelect::where() {
   if (!m_where) {
-    m_where = std::make_shared<WsjcppSqlWhere<WsjcppSqlSelect>>(m_builder, this);
+    m_where = std::make_shared<WsjcppSqlWhere<WsjcppSqlSelect>>(nullptr, m_builder, this);
   }
 
   return *(m_where.get());

src/wsjcpp_sql_builder.h

@@ -86,7 +86,7 @@ class WsjcppSqlBuilderUpdate : public WsjcppSqlQuery {
 class WsjcppSqlBuilder2;
 
 
-enum class WsjcppSqlWhereType { LOGICAL_OPERATOR, CONDITION, SUB };
+enum class WsjcppSqlWhereType { LOGICAL_OPERATOR, CONDITION, SUB_CONDITION };
 
 class WsjcppSqlWhereBase {
 public:
@@ -130,7 +130,8 @@ class WsjcppSqlSelect;
 template<class T>
 class WsjcppSqlWhere : public WsjcppSqlWhereBase {
 public:
-  WsjcppSqlWhere(WsjcppSqlBuilder2 *builder, T *query) : WsjcppSqlWhereBase(WsjcppSqlWhereType::SUB), m_builder(builder), m_query(query) { }
+  WsjcppSqlWhere(WsjcppSqlWhere<T> *parent, WsjcppSqlBuilder2 *builder, T *query)
+    : WsjcppSqlWhereBase(WsjcppSqlWhereType::SUB_CONDITION), m_parent(parent), m_builder(builder), m_query(query) { }
 
   WsjcppSqlWhere<T> &notEqual(const std::string &name, const std::string &value) {
     cond(name, WsjcppSqlWhereConditionType::NOT_EQUAL, value);
@@ -184,14 +185,40 @@ class WsjcppSqlWhere : public WsjcppSqlWhereBase {
     return *this;
   }
 
+  WsjcppSqlWhere<T> &subCondition() {
+    if (
+      m_conditions.size() > 0
+      && m_conditions[m_conditions.size()-1]->type() == WsjcppSqlWhereType::CONDITION
+    ) {
+        and_(); // default add and_
+    }
+    auto sub_cond = std::make_shared<WsjcppSqlWhere<T>>(this, m_builder, m_query);
+    m_conditions.push_back(sub_cond);
+    return *(sub_cond.get());
+  }
+
+  WsjcppSqlWhere<T> &finishSubCondition() {
+    // TODO return parent
+    if (m_parent != nullptr) {
+      return *m_parent;
+    }
+    // default return current where
+    // TODO warning to builder
+    return *this;
+  }
+
   T &endWhere() {
     return *m_query;
   }
 
   virtual std::string sql() override {
     std::string ret = "";
     for (auto item : m_conditions) {
-      ret += item->sql();
+      if (item->type() == WsjcppSqlWhereType::SUB_CONDITION) {
+        ret += "(" + item->sql() + ")";
+      } else {
+        ret += item->sql();
+      }
     }
     return ret;
   }
@@ -210,6 +237,7 @@ class WsjcppSqlWhere : public WsjcppSqlWhereBase {
 
   WsjcppSqlBuilder2 *m_builder;
   T *m_query;
+  WsjcppSqlWhere<T> *m_parent;
   std::vector<std::shared_ptr<WsjcppSqlWhereBase>> m_conditions;
 };