column, placeholder and column_value generator progress

source/orm/CMakeLists.txt

@@ -44,7 +44,7 @@ add_library(matador-orm STATIC
   ../../include/matador/query/intermediates/query_update_intermediate.hpp
   ../../include/matador/query/intermediates/query_where_intermediate.hpp
   ../../include/matador/query/internal/basic_type_to_string_visitor.hpp
-  ../../include/matador/query/internal/key_value_pair.hpp
+  ../../include/matador/query/internal/column_value_pair.hpp
   ../../include/matador/query/internal/query_parts.hpp
   ../../include/matador/query/join_data.hpp
   ../../include/matador/query/key_value_generator.hpp
@@ -123,7 +123,7 @@ add_library(matador-orm STATIC
   query/intermediates/query_update_intermediate.cpp
   query/intermediates/query_where_intermediate.cpp
   query/internal/basic_type_to_string_visitor.cpp
-  query/internal/key_value_pair.cpp
+  query/internal/column_value_pair.cpp
   query/internal/query_parts.cpp
   query/internal/query_result_impl.cpp
   query/key_value_generator.cpp
@@ -154,6 +154,8 @@ add_library(matador-orm STATIC
   sql/statement.cpp
   sql/statement_cache.cpp
   sql/table.cpp
+  ../../include/matador/query/generator.hpp
+  query/generator.cpp
 )
 
 target_include_directories(matador-orm