added column names and values generator and tests

src/CMakeLists.txt

@@ -12,7 +12,8 @@ set(SQL_SOURCES
   sql/session.cpp
   sql/backend_provider.cpp
   sql/query_result_impl.cpp
-  sql/column_generator.cpp)
+  sql/column_generator.cpp
+  sql/column_name_generator.cpp)
 
 set(SQL_HEADER
   ../include/matador/sql/dialect.hpp
@@ -33,7 +34,10 @@ set(SQL_HEADER
   ../include/matador/sql/session.hpp
   ../include/matador/sql/backend_provider.hpp
   ../include/matador/sql/query_result_impl.hpp
-  ../include/matador/sql/column_generator.hpp)
+  ../include/matador/sql/column_generator.hpp
+  ../include/matador/sql/column_name_generator.hpp
+  ../include/matador/sql/value_generator.hpp
+  ../include/matador/sql/any_type.hpp)
 
 set(UTILS_HEADER
   ../include/matador/utils/field_attributes.hpp
@@ -52,7 +56,8 @@ set(UTILS_SOURCES
   sql/condition.cpp
   utils/library.cpp
   utils/os.cpp
-  utils/identifier.cpp)
+  utils/identifier.cpp
+  sql/value_generator.cpp)
 
 add_library(matador STATIC ${SQL_SOURCES} ${SQL_HEADER} ${UTILS_SOURCES} ${UTILS_HEADER})
 target_include_directories(matador PUBLIC ${PROJECT_SOURCE_DIR}/include)

src/sql/column_generator.cpp

@@ -1,5 +1,7 @@
 #include "matador/sql/column_generator.hpp"
 
+#include "matador/utils/identifiable.hpp"
+
 namespace matador::sql {
 
 column_generator::column_generator(std::vector<column> &columns)
@@ -17,7 +19,8 @@ void column_generator::on_revision(const char *id, unsigned long long int &x)
 
 void column_generator::on_belongs_to(const char *id, utils::identifiable &x, utils::cascade_type)
 {
-
+  columns_.push_back(fk_column_generator_.generate(id, x));
+//  x.primary_key().serialize(fk_column_generator)
 }
 
 void column_generator::on_has_one(const char *id, utils::identifiable &x, utils::cascade_type)
@@ -25,4 +28,62 @@ void column_generator::on_has_one(const char *id, utils::identifiable &x, utils:
 
 }
 
+column fk_column_generator::generate(const char *id, utils::identifiable &x)
+{
+  identifiable_ = x;
+  id_ = id;
+  x.primary_key().serialize(*this);
+  return column_;
+}
+
+void fk_column_generator::serialize(short &i, const utils::field_attributes &attributes)
+{
+  column_.
+
+}
+
+void fk_column_generator::serialize(int &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(long &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(long long int &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(unsigned short &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(unsigned int &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(unsigned long &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(unsigned long long int &i, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(std::string &string, const utils::field_attributes &attributes)
+{
+
+}
+
+void fk_column_generator::serialize(utils::null_type_t &type, const utils::field_attributes &attributes)
+{
+
+}
 }

src/sql/column_name_generator.cpp

@@ -0,0 +1,29 @@
+#include "matador/sql/column_name_generator.hpp"
+
+namespace matador::sql {
+
+column_name_generator::column_name_generator(std::vector<std::string> &column_names)
+: column_names_(column_names)
+{}
+
+void column_name_generator::on_primary_key(const char *id, std::string &, size_t)
+{
+  column_names_.emplace_back(id);
+}
+
+void column_name_generator::on_revision(const char *id, unsigned long long int &)
+{
+  column_names_.emplace_back(id);
+}
+
+void column_name_generator::on_belongs_to(const char *id, utils::identifiable &, utils::cascade_type)
+{
+  column_names_.emplace_back(id);
+}
+
+void column_name_generator::on_has_one(const char *id, utils::identifiable &, utils::cascade_type)
+{
+  column_names_.emplace_back(id);
+}
+
+}

src/sql/value_generator.cpp

@@ -0,0 +1,36 @@
+#include "matador/sql/value_generator.hpp"
+
+namespace matador::sql {
+
+value_generator::value_generator(std::vector<any_type> &values)
+: values_(values)
+{}
+
+void value_generator::on_primary_key(const char *, std::string &pk, size_t)
+{
+  append(pk);
+}
+
+void value_generator::on_revision(const char *, unsigned long long int &rev)
+{
+  append(rev);
+}
+
+void value_generator::on_attribute(const char *, char *x, const utils::field_attributes &)
+{
+  append(x);
+}
+
+void value_generator::on_attribute(const char *, std::string &x, const utils::field_attributes &)
+{
+  append(x);
+}
+
+void value_generator::on_belongs_to(const char *, utils::identifiable &x, utils::cascade_type) {
+
+}
+
+void value_generator::on_has_one(const char *, utils::identifiable &x, utils::cascade_type) {
+
+}
+}