Added sql() method for compile query

Author: sea5kg

src/tests/test_select.cpp

@@ -35,8 +35,24 @@ int main() {
     .colum("COL2")
     .colum("COL3")
   ;
-  builder.hasErrors();
-  // builder.sql();
+  if (builder.hasErrors()) {
+    return -1;
+  }
+  std::string sqlQuery = builder.sql();
+  std::string sqlQueryExpected = "SELECT COL1, COL2, COL3 FROM TABLE_NAME";
+  if (sqlQuery != sqlQueryExpected) {
+    std::cerr
+      << "Expected:" << std::endl
+      << "   " << sqlQueryExpected << std::endl
+      << ", but got:" << std::endl
+      << "   " << sqlQuery << std::endl
+    ;
+    return -1;
+  }
+
+  builder.clear();
+
+  
 
   return 0;
 }

src/wsjcpp_sql_builder.cpp

@@ -311,6 +311,26 @@ WsjcppSqlBuilder2 &WsjcppSqlSelect::compile() {
   return *m_builder;
 }
 
+std::string WsjcppSqlSelect::sql() {
+  std::string ret = "SELECT ";
+  // TODO TOP OR LINIT for different databases
+  bool first = true;
+  for (auto col : m_columns) {
+    // TODO and 'AS'
+    if (!first) {
+      ret += ", ";
+    }
+    ret += col;
+    first = false;
+  }
+  ret += " FROM ";
+  ret += m_tableName;
+  // TODO where
+  // TODO group by
+  // TODO order by
+  return ret;
+}
+
 // ---------------------------------------------------------------------
 // WsjcppSqlBuilder2
 
@@ -345,4 +365,19 @@ bool WsjcppSqlBuilder2::hasErrors() {
 
 void WsjcppSqlBuilder2::addError(const std::string &err) {
   m_errors.push_back(err);
+}
+
+std::string WsjcppSqlBuilder2::sql() {
+  std::string ret = "";
+  for (auto query : m_queries) {
+    if (ret.size() > 0) {
+      ret += "\n";
+    }
+    ret += query->sql();
+  }
+  return ret;
+}
+
+void WsjcppSqlBuilder2::clear() {
+  m_queries.clear();
 }

src/wsjcpp_sql_builder.h

@@ -51,6 +51,8 @@ class WsjcppSqlQuery {
   bool isValid();
   std::string getErrorMessage();
 
+  virtual std::string sql() { return ""; }; // TODO = 0;
+
 private:
   std::string prepareStringValue(const std::string &sValue);
   bool checkName(const std::string &sColumnName);
@@ -83,6 +85,13 @@ class WsjcppSqlBuilderUpdate : public WsjcppSqlQuery {
 
 class WsjcppSqlBuilder2;
 
+// class WsjcppSqlWhere {
+// public:
+//   WsjcppSqlWhere();
+
+// };
+
+
 class WsjcppSqlSelect : public WsjcppSqlQuery {
 public:
   WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder2 *builder);
@@ -91,7 +100,7 @@ class WsjcppSqlSelect : public WsjcppSqlQuery {
   // TODO group by
   // TODO order by
   WsjcppSqlBuilder2 &compile();
-  std::string getSql();
+  virtual std::string sql() override;
 
 private:
   std::string m_tableName;
@@ -107,6 +116,8 @@ class WsjcppSqlBuilder2 {
   WsjcppSqlBuilder2 &makeDelete(const std::string &sSqlTable);
 
   bool hasErrors();
+  std::string sql();
+  void clear();
 
 protected:
   friend WsjcppSqlSelect;