column, placeholder and column_value generator progress

test/backends/QueryBasicTest.cpp

@@ -6,9 +6,9 @@
 
 #include "matador/sql/connection.hpp"
 #include "matador/sql/dialect.hpp"
-#include "matador/sql/column_generator.hpp"
 
 #include "matador/query/criteria.hpp"
+#include "matador/query/generator.hpp"
 #include "matador/query/query.hpp"
 
 #include "matador/utils/basic_types.hpp"
@@ -75,7 +75,7 @@ TEST_CASE_METHOD( QueryFixture, "Insert and select basic datatypes", "[query][da
     };
 
     res = query::insert()
-          .into("types", column_generator::generate<types>(repo, true))
+          .into("types", generator::columns<types>(repo))
           .values(t)
           .execute(db);
     REQUIRE(res.is_ok());
@@ -363,7 +363,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key", "[query][primary key]") {
   pk pk1{ 7, "george" };
 
   res = query::insert()
-    .into("pk", column_generator::generate<pk>(repo))
+    .into("pk", generator::columns<pk>(repo))
     .values(pk1)
     .execute(db);
   REQUIRE(res.is_ok());
@@ -392,7 +392,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
   pk pk1{ 7, "george" };
 
   auto stmt = query::insert()
-    .into("pk", column_generator::generate<pk>(repo))
+    .into("pk", generator::columns<pk>(repo))
     .values<pk>()
     .prepare(db);
 REQUIRE(stmt);