Added columns 'AS' to select

Author: sea5kg

src/tests/test_select.cpp

@@ -30,16 +30,16 @@
 
 int main() {
   WsjcppSqlBuilder2 builder;
-  builder.selectFrom("TABLE_NAME")
-    .colum("COL1")
-    .colum("COL2")
-    .colum("COL3")
+  builder.selectFrom("table1")
+    .colum("col1")
+    .colum("col2", "c3")
+    .colum("col3")
   ;
   if (builder.hasErrors()) {
     return -1;
   }
   std::string sqlQuery = builder.sql();
-  std::string sqlQueryExpected = "SELECT COL1, COL2, COL3 FROM TABLE_NAME";
+  std::string sqlQueryExpected = "SELECT col1, col2 AS c3, col3 FROM table1";
   if (sqlQuery != sqlQueryExpected) {
     std::cerr
       << "Expected:" << std::endl
@@ -52,7 +52,7 @@ int main() {
 
   builder.clear();
 
-  
+
 
   return 0;
 }

src/wsjcpp_sql_builder.cpp

@@ -297,12 +297,13 @@ WsjcppSqlSelect::WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder2
   m_builder = builder;
 }
 
-WsjcppSqlSelect &WsjcppSqlSelect::colum(const std::string &col) {
+WsjcppSqlSelect &WsjcppSqlSelect::colum(const std::string &col, const std::string &col_as) {
   auto it = std::find(m_columns.begin(), m_columns.end(), col);
   if (it != m_columns.end()) {
     m_builder->addError("Column '" + col + "' already added to select");
   } else {
     m_columns.push_back(col);
+    m_columns_as[col] = col_as;
   }
   return *this;
 }
@@ -313,14 +314,16 @@ WsjcppSqlBuilder2 &WsjcppSqlSelect::compile() {
 
 std::string WsjcppSqlSelect::sql() {
   std::string ret = "SELECT ";
-  // TODO TOP OR LINIT for different databases
+  // TODO TOP OR LIMIT for different databases
   bool first = true;
   for (auto col : m_columns) {
-    // TODO and 'AS'
     if (!first) {
       ret += ", ";
     }
     ret += col;
+    if (m_columns_as[col] != "") {
+      ret += " AS " + m_columns_as[col];
+    }
     first = false;
   }
   ret += " FROM ";

src/wsjcpp_sql_builder.h

@@ -85,17 +85,19 @@ class WsjcppSqlBuilderUpdate : public WsjcppSqlQuery {
 
 class WsjcppSqlBuilder2;
 
-// class WsjcppSqlWhere {
-// public:
-//   WsjcppSqlWhere();
+class WsjcppSqlWhere {
+public:
+  WsjcppSqlWhere();
+private:
 
-// };
+};
 
 
 class WsjcppSqlSelect : public WsjcppSqlQuery {
 public:
   WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder2 *builder);
-  WsjcppSqlSelect &colum(const std::string &col);
+  WsjcppSqlSelect &colum(const std::string &col, const std::string &col_as = "");
+
   // TODO where
   // TODO group by
   // TODO order by
@@ -106,6 +108,7 @@ class WsjcppSqlSelect : public WsjcppSqlQuery {
   std::string m_tableName;
   WsjcppSqlBuilder2 *m_builder;
   std::vector<std::string> m_columns;
+  std::map<std::string, std::string> m_columns_as;
 };
 
 class WsjcppSqlBuilder2 {