Renamed WsjcppSqlBuilder2 to WsjcppSqlBuilder

Author: sea5kg

README.md

@@ -23,7 +23,7 @@ Example main func:
 #include <wsjcpp_sql_builder.h>
 
 int main(int argc, const char* argv[]) {
-  WsjcppSqlBuilder2 builder;
+  WsjcppSqlBuilder builder;
   builder.selectFrom("table1")
   .colum("col1")
   .colum("col2", "c3")

src/tests/test_insert.cpp

@@ -29,7 +29,7 @@
 #include <wsjcpp_sql_builder.h>
 
 int main() {
-    WsjcppSqlBuilder2 builder;
+    WsjcppSqlBuilder builder;
     builder.insertInto("table1");
 
     if (builder.hasErrors()) {

src/tests/test_select.cpp

@@ -29,7 +29,7 @@
 #include <wsjcpp_sql_builder.h>
 
 int main() {
-  WsjcppSqlBuilder2 builder;
+  WsjcppSqlBuilder builder;
   builder.selectFrom("table1")
     .colum("col1")
     .colum("col2", "c3")

src/wsjcpp_sql_builder.cpp

@@ -177,7 +177,7 @@ std::string WsjcppSqlWhereCondition::sql() {
 // ---------------------------------------------------------------------
 // WsjcppSqlBuilderUpdate
 
-WsjcppSqlSelect::WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder2 *builder)
+WsjcppSqlSelect::WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder *builder)
 : WsjcppSqlQuery(WsjcppSqlBuilderType::SELECT, tableName) {
   // TODO multitype table names with AS
   m_tableName = tableName;
@@ -203,7 +203,7 @@ WsjcppSqlWhere<WsjcppSqlSelect> &WsjcppSqlSelect::where() {
   return *(m_where.get());
 }
 
-WsjcppSqlBuilder2 &WsjcppSqlSelect::compile() {
+WsjcppSqlBuilder &WsjcppSqlSelect::compile() {
   return *m_builder;
 }
 
@@ -240,43 +240,43 @@ std::string WsjcppSqlSelect::sql() {
 }
 
 // ---------------------------------------------------------------------
-// WsjcppSqlBuilder2
+// WsjcppSqlBuilder
 
-WsjcppSqlSelect &WsjcppSqlBuilder2::selectFrom(const std::string &tableName) {
+WsjcppSqlSelect &WsjcppSqlBuilder::selectFrom(const std::string &tableName) {
   m_tableName = tableName;
   m_nSqlType = WsjcppSqlBuilderType::SELECT;
   m_queries.push_back(std::make_shared<WsjcppSqlSelect>(m_tableName, this));
   // TODO check must be select last one;
   return *(WsjcppSqlSelect *)(m_queries[m_queries.size() -1].get());
 }
 
-WsjcppSqlBuilder2 &WsjcppSqlBuilder2::insertInto(const std::string &tableName) {
+WsjcppSqlBuilder &WsjcppSqlBuilder::insertInto(const std::string &tableName) {
   m_tableName = tableName;
   m_nSqlType = WsjcppSqlBuilderType::INSERT;
   return *this;
 }
 
-// WsjcppSqlBuilder2 &WsjcppSqlBuilder2::makeUpdate(const std::string &tableName) {
+// WsjcppSqlBuilder &WsjcppSqlBuilder::makeUpdate(const std::string &tableName) {
 //   m_tableName = tableName;
 //   m_nSqlType = WsjcppSqlBuilderType::UPDATE;
 //   return *this;
 // }
 
-// WsjcppSqlBuilder2 &WsjcppSqlBuilder2::makeDelete(const std::string &tableName) {
+// WsjcppSqlBuilder &WsjcppSqlBuilder::makeDelete(const std::string &tableName) {
 //   m_tableName = tableName;
 //   m_nSqlType = WsjcppSqlBuilderType::DELETE;
 //   return *this;
 // }
 
-bool WsjcppSqlBuilder2::hasErrors() {
+bool WsjcppSqlBuilder::hasErrors() {
   return m_errors.size() > 0;
 }
 
-void WsjcppSqlBuilder2::addError(const std::string &err) {
+void WsjcppSqlBuilder::addError(const std::string &err) {
   m_errors.push_back(err);
 }
 
-std::string WsjcppSqlBuilder2::sql() {
+std::string WsjcppSqlBuilder::sql() {
   std::string ret = "";
   for (auto query : m_queries) {
     if (ret.size() > 0) {
@@ -287,6 +287,6 @@ std::string WsjcppSqlBuilder2::sql() {
   return ret;
 }
 
-void WsjcppSqlBuilder2::clear() {
+void WsjcppSqlBuilder::clear() {
   m_queries.clear();
 }

src/wsjcpp_sql_builder.h

@@ -51,7 +51,7 @@ class WsjcppSqlQuery {
   std::string m_tableName;
 };
 
-class WsjcppSqlBuilder2;
+class WsjcppSqlBuilder;
 
 enum class WsjcppSqlWhereType { LOGICAL_OPERATOR, CONDITION, SUB_CONDITION };
 
@@ -100,7 +100,7 @@ class WsjcppSqlSelect;
 template<class T>
 class WsjcppSqlWhere : public WsjcppSqlWhereBase {
 public:
-  WsjcppSqlWhere(WsjcppSqlWhere<T> *parent, WsjcppSqlBuilder2 *builder, T *query)
+  WsjcppSqlWhere(WsjcppSqlWhere<T> *parent, WsjcppSqlBuilder *builder, T *query)
     : WsjcppSqlWhereBase(WsjcppSqlWhereType::SUB_CONDITION), m_parent(parent), m_builder(builder), m_query(query) { }
 
   template <typename TVal>
@@ -210,39 +210,59 @@ class WsjcppSqlWhere : public WsjcppSqlWhereBase {
     return *this;
   }
 
-  WsjcppSqlBuilder2 *m_builder;
+  WsjcppSqlBuilder *m_builder;
   T *m_query;
   WsjcppSqlWhere<T> *m_parent;
   std::vector<std::shared_ptr<WsjcppSqlWhereBase>> m_conditions;
 };
 
 class WsjcppSqlSelect : public WsjcppSqlQuery {
 public:
-  WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder2 *builder);
+  WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder *builder);
   WsjcppSqlSelect &colum(const std::string &col, const std::string &col_as = "");
 
   WsjcppSqlWhere<WsjcppSqlSelect> &where();
   // TODO group by
   // TODO order by
-  WsjcppSqlBuilder2 &compile();
+  WsjcppSqlBuilder &compile();
   virtual std::string sql() override;
 
 private:
   std::string m_tableName;
-  WsjcppSqlBuilder2 *m_builder;
+  WsjcppSqlBuilder *m_builder;
   std::shared_ptr<WsjcppSqlWhere<WsjcppSqlSelect>> m_where;
   std::vector<std::string> m_columns;
   std::map<std::string, std::string> m_columns_as;
 };
 
-class WsjcppSqlBuilder2 {
+
+// class WsjcppSqlInsert : public WsjcppSqlQuery {
+// public:
+//   WsjcppSqlInsert(const std::string &tableName, WsjcppSqlBuilder *builder);
+//   WsjcppSqlInsert &colum(const std::string &col, const std::string &col_as = "");
+
+//   WsjcppSqlWhere<WsjcppSqlInsert> &where();
+//   // TODO group by
+//   // TODO order by
+//   WsjcppSqlBuilder &compile();
+//   virtual std::string sql() override;
+
+// private:
+//   std::string m_tableName;
+//   WsjcppSqlBuilder *m_builder;
+//   std::shared_ptr<WsjcppSqlWhere<WsjcppSqlSelect>> m_where;
+//   std::vector<std::string> m_columns;
+//   std::map<std::string, std::string> m_columns_as;
+// };
+
+class WsjcppSqlBuilder {
 public:
   // TODO begin / end transaction can be added here
 
   WsjcppSqlSelect &selectFrom(const std::string &tableName);
-  WsjcppSqlBuilder2 &insertInto(const std::string &tableName);
-  // WsjcppSqlBuilder2 &makeUpdate(const std::string &sSqlTable);
-  // WsjcppSqlBuilder2 &makeDelete(const std::string &sSqlTable);
+  WsjcppSqlBuilder &insertInto(const std::string &tableName);
+  // WsjcppSqlBuilder &makeUpdate(const std::string &sSqlTable);
+  // WsjcppSqlBuilder &makeDelete(const std::string &sSqlTable);
 
   bool hasErrors();
   std::string sql();