include/matador/object/join_columns_collector.hpp

@@ -26,15 +26,15 @@ public:
     }
     template < class V >
     static void on_primary_key(const char * /*id*/, V &, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {}
-    static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
+    static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}
     template<typename Type>
     static void on_attribute(const char * /*id*/, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}
     template<class Pointer>
-    static void on_belongs_to(const char * /*id*/, Pointer &/*obj*/, const utils::foreign_attributes &/*attr*/) {}
+    static void on_belongs_to(const char * /*id*/, Pointer &obj, const utils::foreign_attributes &attr) {}
     template<class Pointer>
-    static void on_has_one(const char * /*id*/, Pointer &/*obj*/, const utils::foreign_attributes &/*attr*/) {}
+    static void on_has_one(const char * /*id*/, Pointer &obj, const utils::foreign_attributes &attr) {}
     template<class ContainerType>
-    static void on_has_many(ContainerType &, const char */*join_column*/, const utils::foreign_attributes &/*attr*/) {}
+    static void on_has_many(ContainerType &, const char *join_column, const utils::foreign_attributes &attr) {}
     template<class ContainerType>
     void on_has_many_to_many(const char * /*id*/, ContainerType &/*c*/, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &/*attr*/) {
         join_columns_.join_column = join_column;

include/matador/orm/session.hpp

@@ -4,7 +4,6 @@
 #include "matador/orm/error_code.hpp"
 #include "matador/orm/session_query_builder.hpp"
 
-#include "matador/query/condition.hpp"
 #include "matador/query/query.hpp"
 
 #include "matador/sql/column_generator.hpp"
@@ -59,11 +58,11 @@ public:
 
   template < class V >
   static void on_primary_key(const char * /*id*/, V &/*pk*/, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {}
-  static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
+  static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}
   template<typename Type>
   static void on_attribute(const char * /*id*/, Type &/*obj*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}
   template<class Pointer>
-  void on_belongs_to(const char *id, Pointer &/*obj*/, const utils::foreign_attributes &/*attr*/) {
+  void on_belongs_to(const char *id, Pointer &obj, const utils::foreign_attributes &attr) {
       const auto it = statements_per_column_.find(id);
       if (it == statements_per_column_.end()) {
           return;
@@ -72,7 +71,7 @@ public:
 
   }
   template<class Pointer>
-  void on_has_one(const char * /*id*/, Pointer &/*obj*/, const utils::foreign_attributes &/*attr*/) {
+  void on_has_one(const char *id, Pointer &obj, const utils::foreign_attributes &attr) {
 
   }
   template<class ContainerType>
@@ -194,20 +193,18 @@ utils::result<object::object_ptr<Type>, utils::error> session::update( const obj
     if (!info) {
         return utils::failure(info.err());
     }
-    using namespace matador::utils;
-    using namespace matador::query;
 
-    const auto col = sql::column(info.value().get().definition().primary_key()->name());
-    auto res = matador::query::query::update(info->get().name())
+    const auto col = sql::column(info->get()->prototype().primary_key()->name());
+    auto res = query::query::update(info->get().name())
       .set(*obj)
-      .where(col == _)
+      .where(col == utils::_)
       .prepare(*this);
     if (!res) {
         return utils::failure(res.err());
     }
 
-    if (const auto update_result = res->bind(*obj).execute(); !update_result.is_ok()) {
-        return utils::failure(update_result.err());
+    if (const auto insert_result = res->bind(*obj).execute(); !insert_result.is_ok()) {
+        return utils::failure(insert_result.err());
     }
     return utils::ok(object::object_ptr{obj});
 }

include/matador/orm/session_insert_builder.hpp

@@ -67,7 +67,7 @@ public:
     push(id, x);
   }
 
-  void on_revision(const char *id, uint64_t &/*rev*/);
+  void on_revision(const char *id, unsigned long long &/*rev*/);
 
   template<typename Type>
   void on_attribute(const char *id, Type &x, const utils::field_attributes &/*attr*/ = utils::null_attributes) {

include/matador/orm/session_query_builder.hpp

@@ -98,7 +98,7 @@ public:
     }
   }
 
-  void on_revision(const char *id, uint64_t &/*rev*/);
+  void on_revision(const char *id, unsigned long long &/*rev*/);
 
   template<typename Type>
   void on_attribute(const char *id, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes)

include/matador/query/fk_value_extractor.hpp

@@ -25,7 +25,7 @@ public:
   void on_primary_key(const char *, ValueType &pk, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {
     value_ = pk;
   }
-  static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
+  static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}
   template < class Type >
   static void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}
   static void on_attribute(const char * /*id*/, char * /*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}

include/matador/query/key_value_generator.hpp

@@ -15,11 +15,12 @@ class key_value_generator
 {
 private:
 public:
-  explicit key_value_generator(std::vector<internal::key_value_pair> &result);
+  explicit key_value_generator(std::vector<internal::key_value_pair> &result) : result_(result) {}
 
 public:
   template < class Type >
-  static std::vector<internal::key_value_pair> generate(const Type &obj) {
+  static std::vector<internal::key_value_pair> generate(const Type &obj)
+  {
     std::vector<internal::key_value_pair> result;
     key_value_generator generator(result);
     access::process(generator, obj);
@@ -29,28 +30,31 @@ public:
 
   template < class V >
   void on_primary_key(const char *id, V &x, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {
-    // result_.emplace_back(id, x);
+    result_.emplace_back(id, x);
   }
-  void on_revision(const char *id, uint64_t &/*rev*/);
+  void on_revision(const char *id, unsigned long long &/*rev*/);
 
   template<typename Type>
-  void on_attribute(const char *id, Type &x, const utils::field_attributes &/*attr*/ = utils::null_attributes) {
+  void on_attribute(const char *id, Type &x, const utils::field_attributes &/*attr*/ = utils::null_attributes)
+  {
     result_.emplace_back(id, x);
   }
 
   template<class Type, template < class ... > class Pointer>
-  void on_belongs_to(const char *id, Pointer<Type> &x, const utils::foreign_attributes &/*attr*/) {
+  void on_belongs_to(const char *id, Pointer<Type> &x, const utils::foreign_attributes &/*attr*/)
+  {
     result_.emplace_back(id, fk_value_extractor_.extract(*x));
   }
   template<class Type, template < class ... > class Pointer>
-  void on_has_one(const char *id, Pointer<Type> &x, const utils::foreign_attributes &/*attr*/) {
+  void on_has_one(const char *id, Pointer<Type> &x, const utils::foreign_attributes &/*attr*/)
+  {
     result_.emplace_back(id, fk_value_extractor_.extract(*x));
   }
   template<class ContainerType>
-  static void on_has_many(const char *, ContainerType &, const char *, const char *, const utils::foreign_attributes &/*attr*/) {}
+  void on_has_many(const char *, ContainerType &, const char *, const char *, const utils::foreign_attributes &/*attr*/) {}
 
 private:
-  detail::fk_value_extractor fk_value_extractor_{};
+  detail::fk_value_extractor fk_value_extractor_;
   std::vector<internal::key_value_pair> &result_;
 };
 

include/matador/sql/column_generator.hpp

@@ -61,7 +61,7 @@ public:
       }
       push(id);
   }
-  void on_revision(const char *id, uint64_t &/*rev*/);
+  void on_revision(const char *id, unsigned long long &/*rev*/);
 
   template<typename Type>
   void on_attribute(const char *id, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) {

include/matador/sql/interface/statement_impl.hpp

@@ -26,12 +26,10 @@ public:
   virtual utils::result<std::unique_ptr<query_result_impl>, utils::error> fetch(const parameter_binder& bindings) = 0;
 
   template < class Type >
-  size_t bind_object(Type &obj, parameter_binder& bindings) {
-    object_parameter_binder object_binder_(query_.command != sql_command::SQL_UPDATE);
+  void bind_object(Type &obj, parameter_binder& bindings) {
+    object_parameter_binder object_binder_;
     object_binder_.reset(start_index());
     object_binder_.bind(obj, bindings);
-
-    return object_binder_.current_index();
   }
 
   template < class Type >

include/matador/sql/internal/object_result_binder.hpp

@@ -29,7 +29,7 @@ public:
 
   template<typename ValueType>
   void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr = utils::default_pk_attributes);
-  static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
+  static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}
 
   template < class Type >
   static void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}

include/matador/sql/internal/query_result_impl.hpp

@@ -39,7 +39,7 @@ public:
 
   template<typename ValueType>
   void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr = utils::default_pk_attributes);
-  void on_revision(const char * /*id*/, uint64_t &/*rev*/) {
+  void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {
       ++column_index_;
   }
 

include/matador/sql/internal/query_result_pk_resolver.hpp

@@ -36,7 +36,7 @@ public:
         utils::data_type_traits<ValueType>::read_value(reader_, id, column_index_++, value, attr.size());
         pk_ = value;
     }
-    void on_revision(const char * /*id*/, uint64_t &/*rev*/) { ++column_index_; }
+    void on_revision(const char * /*id*/, unsigned long long &/*rev*/) { ++column_index_; }
 
     template < class Type >
     void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) { ++column_index_; }

include/matador/sql/object_parameter_binder.hpp

@@ -61,8 +61,6 @@ private:
 
 class object_parameter_binder {
 public:
-  explicit object_parameter_binder(bool include_primary_key = true);
-
   template<class Type>
   void bind(Type &obj, utils::attribute_writer &binder) {
     binder_ = &binder;
@@ -71,13 +69,10 @@ public:
   }
 
   void reset(size_t start_index);
-  [[nodiscard]] size_t current_index() const;
 
   template < class Type >
   void on_primary_key(const char * /*id*/, Type &val, const utils::primary_key_attribute& attr = utils::default_pk_attributes) {
-    if (include_primary_key_) {
-      utils::data_type_traits<Type>::bind_value(*binder_, index_++, val, attr.size());
-    }
+    utils::data_type_traits<Type>::bind_value(*binder_, index_++, val, attr.size());
   }
   void on_revision(const char *id, uint64_t &/*rev*/);
 
@@ -114,7 +109,6 @@ private:
   utils::attribute_writer *binder_{};
   size_t index_{0};
   detail::fk_binder fk_binder_;
-  bool include_primary_key_{true};
 };
 
 namespace detail {

source/orm/orm/session_insert_builder.cpp

@@ -1,7 +1,7 @@
 #include "matador/orm/session_insert_builder.hpp"
 
 namespace matador::orm {
-void session_insert_builder::on_revision(const char* id, uint64_t& x) {
+void session_insert_builder::on_revision(const char* id, unsigned long long& x) {
     push(id, x);
 }
 

source/orm/orm/session_query_builder.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 
 namespace matador::orm {
-void session_query_builder::on_revision(const char *id, uint64_t &/*rev*/) {
+void session_query_builder::on_revision(const char *id, unsigned long long &/*rev*/) {
   push(id);
 }
 

source/orm/query/key_value_generator.cpp

@@ -3,10 +3,8 @@
 #include "matador/query/value_extractor.hpp"
 
 namespace matador::query {
-key_value_generator::key_value_generator(std::vector<internal::key_value_pair> &result)
-: result_(result) {}
 
-void key_value_generator::on_revision(const char *id, uint64_t &x) {
+void key_value_generator::on_revision(const char *id, unsigned long long int &x) {
   result_.emplace_back(id, x);
 }
 

source/orm/sql/column_generator.cpp

@@ -31,7 +31,7 @@ std::vector<column> column_generator::generate( const object::repository& scm, c
     return columns;
 }
 
-void column_generator::on_revision(const char *id, uint64_t &)
+void column_generator::on_revision(const char *id, unsigned long long int &)
 {
     if (has_many_to_many_) {
         return;

source/orm/sql/object_parameter_binder.cpp

@@ -2,19 +2,12 @@
 #include "matador/sql/interface/parameter_binder.hpp"
 
 namespace matador::sql {
-object_parameter_binder::object_parameter_binder(bool include_primary_key)
-: include_primary_key_(include_primary_key) {
-}
 
 void object_parameter_binder::reset(const size_t start_index)
 {
   index_ = start_index;
 }
 
-size_t object_parameter_binder::current_index() const {
-  return index_;
-}
-
 void object_parameter_binder::on_revision(const char * /*id*/, uint64_t &rev)
 {
   utils::data_type_traits<uint64_t>::bind_value(*binder_, index_++, rev);