column, placeholder and column_value generator progress

include/matador/orm/session.hpp

@@ -6,8 +6,8 @@
 
 #include "matador/query/criteria.hpp"
 #include "matador/query/query.hpp"
+#include "matador/query/generator.hpp"
 
-#include "matador/sql/column_generator.hpp"
 #include "matador/sql/connection.hpp"
 #include "matador/sql/connection_pool.hpp"
 #include "matador/sql/executor.hpp"
@@ -172,8 +172,8 @@ utils::result<object::object_ptr<Type>, utils::error> session::insert(Type *obj)
   }
 
   auto res = query::query::insert()
-    .into(info->get().name(), sql::column_generator::generate<Type>(*schema_, true))
-    .values(*obj)
+    .into(info->get().name(), query::generator::columns<Type>(*schema_))
+    .values(query::generator::placeholders<Type>())
     .prepare(*this);
   if (!res) {
       return utils::failure(res.err());
@@ -248,7 +248,7 @@ utils::result<object::object_ptr<Type>, utils::error> session::update( const obj
 
     const auto col = sql::column(info.value().get().definition().primary_key()->name());
     auto res = matador::query::query::update(info->get().name())
-      .set(*obj)
+      .set(generator::placeholders<Type>())
       .where(col == _)
       .prepare(*this);
     if (!res) {

include/matador/orm/session_query_builder.hpp

@@ -280,7 +280,7 @@ void session_query_builder::on_foreign_object(const char *id, Pointer &, const u
     using namespace matador::utils;
     using namespace matador::query;
     // create select query
-    auto result = matador::query::query::select(sql::column_generator::generate<typename Pointer::value_type>(schema_, true))
+    auto result = matador::query::query::select(generator::columns<typename Pointer::value_type>(schema_, generator::column_generator_options::ForceLazy))
       .from(*foreign_table)
       .where(sql::column(foreign_table, pk->name(), "") == _)
       .prepare(executor_);