has many generator progress

include/matador/query/insert_query_builder.hpp

@@ -56,7 +56,7 @@ private:
 struct insert_step {
   sql::query_context ctx;
 
-  utils::result<sql::statement, utils::error> acquire_and_bind(sql::statement_cache &cache) const;
+  utils::result<void, utils::error> acquire_and_bind(sql::statement &stmt) const;
 
   // Session uses these to handle manual/sequence/table pre-insert PKs
   utils::generator_type pk_generator{utils::generator_type::Manual};
@@ -300,7 +300,9 @@ private:
       return utils::failure(utils::error{error_code::UnknownType, "Unknown type"});
     }
     step.ctx = cit->second.insert;
-    step.bind_object = [ptr](sql::statement &stmt) { stmt.bind(*ptr); };
+    step.bind_object = [ptr](sql::statement &stmt) {
+      stmt.bind(*ptr);
+    };
     if (info.has_primary_key() && step.pk_generator == utils::generator_type::Identity) {
       const auto pk_name = info.primary_key_attribute()->name();
       const table_column pk_col(&it->second.table(), pk_name);

include/matador/query/session.hpp

@@ -112,8 +112,7 @@ utils::result<object::object_ptr<Type>, utils::error> session::insert(object::ob
       return utils::failure(stmt.err());
     }
 
-    auto result = step.acquire_and_bind(cache_);
-    if (!result.is_ok()) {
+    if (auto result = step.acquire_and_bind(*stmt); !result.is_ok()) {
       return utils::failure(result.err());
     }
 
@@ -127,7 +126,7 @@ utils::result<object::object_ptr<Type>, utils::error> session::insert(object::ob
         return utils::failure(make_error(error_code::FailedToFindObject, "Failed to insert object and retrieve identity."));
       }
       step.apply_returning(*record.value());
-    } else if (const auto exec_result = result->execute(); !exec_result.is_ok()) {
+    } else if (const auto exec_result = stmt->execute(); !exec_result.is_ok()) {
       return utils::failure(exec_result.err());
     }
     step.make_object_persistent();
@@ -157,9 +156,7 @@ public:
     stmt_.bind(binding_position_, x);
   }
 
-  static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {
-  }
-
+  static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
   template<class Type>
   static void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/) {}
   template<class Pointer>
@@ -257,8 +254,7 @@ utils::result<object::object_ptr<Type>, utils::error> session::find(const Primar
   select_query_builder eqb(schema_);
   auto data = eqb.build<Type>(*it->second.table().primary_key_column() == pk);
   if (!data.is_ok()) {
-    return utils::failure(make_error(error_code::FailedToBuildQuery,
-                                     "Failed to build query for type " + it->second.name() + "."));
+    return utils::failure(make_error(error_code::FailedToBuildQuery, "Failed to build query for type " + it->second.name() + "."));
   }
 
   auto ctx = data->compile(dialect_);
@@ -272,7 +268,7 @@ utils::result<object::object_ptr<Type>, utils::error> session::find(const Primar
 }
 
 template<typename Type>
-utils::result<sql::query_result<Type>, utils::error> session::find(query::criteria_ptr clause) {
+utils::result<sql::query_result<Type>, utils::error> session::find(criteria_ptr clause) {
   const auto it = schema_.find(typeid(Type));
   if (it == schema_.end()) {
     return utils::failure(make_error(error_code::UnknownType, "Failed to determine requested type."));

include/matador/utils/primary_key_accessor.hpp

@@ -25,7 +25,7 @@ public:
   static void on_base(const BaseType&) {}
   template<typename PrimaryKeyType>
   void on_primary_key(const char * /*id*/, PrimaryKeyType &pk, const primary_key_attribute & = DefaultPkAttributes) {
-    const auto value = pk_.as<PrimaryKeyType>();
+    const auto value = pk_.convert<PrimaryKeyType>();
     if (!value) {
       // Todo: throw error
     }

include/matador/utils/primary_key_attribute.hpp

@@ -48,7 +48,10 @@ private:
 };
 
 const primary_key_attribute DefaultPkAttributes {};
+const primary_key_attribute Manual {generator_type::Manual};
 const primary_key_attribute Identity {generator_type::Identity};
+const primary_key_attribute Sequence {generator_type::Sequence};
+const primary_key_attribute Table {generator_type::Table};
 const primary_key_attribute ManualVarChar63 {63};
 const primary_key_attribute ManualVarChar127 {127};
 const primary_key_attribute ManualVarChar255 {255};