Refactor and prepare dbType

Author: sea5kg

src/wsjcpp_sql_builder.cpp

@@ -405,6 +405,10 @@ std::string WsjcppSqlDelete::sql() {
 // ---------------------------------------------------------------------
 // WsjcppSqlBuilder
 
+WsjcppSqlBuilder::WsjcppSqlBuilder(WsjcppSqlBuilderForDatabase dbType) : m_dbType(dbType) {
+
+}
+
 WsjcppSqlSelect &WsjcppSqlBuilder::selectFrom(const std::string &tableName) {
   m_queries.push_back(std::make_shared<WsjcppSqlSelect>(tableName, this));
   // TODO check must be select last one;
@@ -453,6 +457,10 @@ WsjcppSqlDelete &WsjcppSqlBuilder::findDeleteOrCreate(const std::string &tableNa
   return deleteFrom(tableName);
 }
 
+void WsjcppSqlBuilder::clear() {
+  m_queries.clear();
+}
+
 bool WsjcppSqlBuilder::hasErrors() {
   return m_errors.size() > 0;
 }
@@ -472,6 +480,12 @@ std::string WsjcppSqlBuilder::sql() {
   return ret;
 }
 
-void WsjcppSqlBuilder::clear() {
-  m_queries.clear();
-}
+
+void WsjcppSqlBuilder::setDatabaseType(WsjcppSqlBuilderForDatabase dbType) {
+  m_dbType = dbType;
+}
+
+WsjcppSqlBuilderForDatabase WsjcppSqlBuilder::databaseType() {
+  return m_dbType;
+}
+

src/wsjcpp_sql_builder.h

@@ -32,27 +32,51 @@
 #include <vector>
 #include <memory>
 
+enum class WsjcppSqlQueryType {
+  SELECT,
+  INSERT,
+  UPDATE,
+  DELETE,
+};
+
+enum class WsjcppSqlWhereType {
+  LOGICAL_OPERATOR,
+  CONDITION,
+  SUB_CONDITION,
+};
+
+enum class WsjcppSqlWhereConditionType {
+  NOT_EQUAL,
+  EQUAL,
+  MORE_THEN,
+  LESS_THEN,
+  LIKE,
+};
+
+enum class WsjcppSqlBuilderForDatabase {
+  SQLITE3,
+};
+
 class WsjcppSqlBuilderHelpers {
 public:
   static std::string escapingStringValue(const std::string &sValue);
 };
 
-enum class WsjcppSqlQueryType { SELECT, INSERT, UPDATE, DELETE };
-
-
+class WsjcppSqlBuilder;
 class WsjcppSqlQuery;
 class WsjcppSqlInsert;
 class WsjcppSqlUpdate;
 class WsjcppSqlSelect;
 class WsjcppSqlDelete;
 template<class T> class WsjcppSqlWhere;
 
-
 class IWsjcppSqlBuilder {
 public:
 
   virtual bool hasErrors() = 0;
   virtual std::string sql() = 0;
+  virtual void setDatabaseType(WsjcppSqlBuilderForDatabase dbType) = 0;
+  virtual WsjcppSqlBuilderForDatabase databaseType() = 0;
 
 protected:
   friend WsjcppSqlWhere<WsjcppSqlInsert>;
@@ -63,7 +87,7 @@ class IWsjcppSqlBuilder {
   virtual void addError(const std::string &err) = 0;
 };
 
-class WsjcppSqlBuilder;
+
 
 class WsjcppSqlQuery {
 public:
@@ -80,8 +104,6 @@ class WsjcppSqlQuery {
   WsjcppSqlBuilder *m_builder;
 };
 
-enum class WsjcppSqlWhereType { LOGICAL_OPERATOR, CONDITION, SUB_CONDITION };
-
 class WsjcppSqlWhereBase {
 public:
   WsjcppSqlWhereBase(WsjcppSqlWhereType type);
@@ -104,8 +126,6 @@ class WsjcppSqlWhereAnd : public WsjcppSqlWhereBase {
   virtual std::string sql() override;
 };
 
-enum class WsjcppSqlWhereConditionType { NOT_EQUAL, EQUAL, MORE_THEN, LESS_THEN, LIKE };
-
 class WsjcppSqlWhereCondition : public WsjcppSqlWhereBase {
 public:
   WsjcppSqlWhereCondition(const std::string &name, WsjcppSqlWhereConditionType comparator, const std::string &value);
@@ -313,6 +333,8 @@ class WsjcppSqlDelete : public WsjcppSqlQuery {
 
 class WsjcppSqlBuilder : public IWsjcppSqlBuilder {
 public:
+  WsjcppSqlBuilder(WsjcppSqlBuilderForDatabase dbType = WsjcppSqlBuilderForDatabase::SQLITE3);
+  
   // TODO begin / end transaction can be added here
 
   WsjcppSqlSelect &selectFrom(const std::string &tableName);
@@ -328,6 +350,9 @@ class WsjcppSqlBuilder : public IWsjcppSqlBuilder {
   virtual bool hasErrors() override;
   virtual std::string sql() override;
 
+  virtual void setDatabaseType(WsjcppSqlBuilderForDatabase dbType) override;
+  virtual WsjcppSqlBuilderForDatabase databaseType() override;
+
 protected:
   friend WsjcppSqlSelect;
   friend WsjcppSqlInsert;
@@ -338,4 +363,5 @@ class WsjcppSqlBuilder : public IWsjcppSqlBuilder {
 private:
   std::vector<std::string> m_errors;
   std::vector<std::shared_ptr<WsjcppSqlQuery>> m_queries;
+  WsjcppSqlBuilderForDatabase m_dbType;
 };