refactored identifier, added tests and added primary_key_accessor and tests

include/matador/utils/primary_key_accessor.hpp

@@ -1,104 +1,125 @@
 #ifndef MATADOR_PRIMARY_KEY_ACCESSOR_HPP
 #define MATADOR_PRIMARY_KEY_ACCESSOR_HPP
 
+#include "matador/utils/access.hpp"
 #include "matador/utils/field_attributes.hpp"
+#include "matador/utils/identifier.hpp"
 #include "matador/utils/primary_key_attribute.hpp"
 
 #include <cstdint>
 #include <string>
+#include <utility>
 
 namespace matador::utils {
 class foreign_attributes;
 namespace detail {
-template < typename PrimaryKeyType >
 class primary_key_setter {
 public:
-  explicit primary_key_setter(const std::string &name, const PrimaryKeyType& value)
-  : name_(name)
-  , value_(value){}
+  template <typename ObjectType>
+  void set(ObjectType &obj, const identifier& pk) {
+    pk_ = pk;
+    access::process(*this, obj);
+  }
 
-  void on_primary_key(const char *id, PrimaryKeyType &pk, const utils::primary_key_attribute & = utils::default_pk_attributes) {
-    if (id != nullptr && name_ == id) {
-      pk = static_cast<PrimaryKeyType>(value_);
+  template<typename PrimaryKeyType>
+  void on_primary_key(const char * /*id*/, PrimaryKeyType &pk, const primary_key_attribute & = default_pk_attributes) {
+    const auto value = pk_.as<PrimaryKeyType>();
+    if (!value) {
+      // Todo: throw error
     }
+
+    pk = value.value();
   }
-  template<typename ValueType>
-  static void on_primary_key(const char * /*id*/, ValueType & /*pk*/, const utils::primary_key_attribute & = utils::default_pk_attributes) {}
   static void on_revision(const char * /*id*/, uint64_t & /*rev*/) {}
   template<typename T>
-  static void on_attribute(const char * /*id*/, T &, const utils::field_attributes & = utils::null_attributes) {}
+  static void on_attribute(const char * /*id*/, T &, const field_attributes & = null_attributes) {}
   template<class P>
-  static void on_belongs_to(const char * /*id*/, P &, const utils::foreign_attributes & ) {}
+  static void on_belongs_to(const char * /*id*/, P &, const foreign_attributes & ) {}
   template<class P>
-  static void on_has_one(const char * /*id*/, P &, const utils::foreign_attributes & ) {}
+  static void on_has_one(const char * /*id*/, P &, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many(const char * /*id*/, C &, const char * /*join_column*/, const utils::foreign_attributes & ) {}
+  static void on_has_many(const char * /*id*/, C &, const char * /*join_column*/, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many_to_many(const char * /*id*/, C &, const char * /*join_column*/, const char * /*inverse_join_column*/, const utils::foreign_attributes & ) {}
+  static void on_has_many_to_many(const char * /*id*/, C &, const char * /*join_column*/, const char * /*inverse_join_column*/, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many_to_many(const char * /*id*/, C &, const utils::foreign_attributes & ) {}
+  static void on_has_many_to_many(const char * /*id*/, C &, const foreign_attributes & ) {}
 
 private:
-  const std::string &name_;
-  PrimaryKeyType value_{};
+  identifier pk_{};
 };
 
 struct pk_unset_checker {
-  const std::string &name;
   bool unset{true};
 
-  template<class V>
-  void on_primary_key(const char *id, V &pk, const utils::primary_key_attribute & = utils::default_pk_attributes) {
-    if (id != nullptr && name == id) {
-      // Your convention: 0 means unset for integer PKs
-      unset = (static_cast<std::uint64_t>(pk) == 0ULL);
-    }
+  template<class PrimaryKeyType>
+  void on_primary_key(const char * /*id*/, PrimaryKeyType &pk, const primary_key_attribute & = default_pk_attributes) {
+    unset = !identifier_type_traits<PrimaryKeyType>::is_valid(pk);
   }
   static void on_revision(const char * /*id*/, uint64_t & /*rev*/) {}
   template<typename T>
-  static void on_attribute(const char * /*id*/, T &, const utils::field_attributes & = utils::null_attributes) {}
+  static void on_attribute(const char * /*id*/, T &, const field_attributes & = null_attributes) {}
   template<class P>
-  static void on_belongs_to(const char * /*id*/, P &, const utils::foreign_attributes & ) {}
+  static void on_belongs_to(const char * /*id*/, P &, const foreign_attributes & ) {}
   template<class P>
-  static void on_has_one(const char * /*id*/, P &, const utils::foreign_attributes & ) {}
+  static void on_has_one(const char * /*id*/, P &, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many(const char * /*id*/, C &, const char * /*join_column*/, const utils::foreign_attributes & ) {}
+  static void on_has_many(const char * /*id*/, C &, const char * /*join_column*/, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many_to_many(const char * /*id*/, C &, const char * /*join_column*/, const char * /*inverse_join_column*/, const utils::foreign_attributes & ) {}
+  static void on_has_many_to_many(const char * /*id*/, C &, const char * /*join_column*/, const char * /*inverse_join_column*/, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many_to_many(const char * /*id*/, C &, const utils::foreign_attributes & ) {}
+  static void on_has_many_to_many(const char * /*id*/, C &, const foreign_attributes & ) {}
 };
 
-struct pk_value_extractor {
+struct primary_key_getter {
   std::uint64_t value{0};
 
-  template<class V>
-  void on_primary_key(const char * /*id*/, V &pk, const utils::primary_key_attribute & = utils::default_pk_attributes) {
-    value = static_cast<std::uint64_t>(pk);
+  template<class PrimaryKeyType>
+  void on_primary_key(const char * /*id*/, PrimaryKeyType &pk, const primary_key_attribute & = default_pk_attributes) {
+    pk_ = pk;
   }
   static void on_revision(const char * /*id*/, uint64_t & /*rev*/) {}
   template<typename T>
-  static void on_attribute(const char * /*id*/, T &, const utils::field_attributes & = utils::null_attributes) {}
+  static void on_attribute(const char * /*id*/, T &, const field_attributes & = null_attributes) {}
   template<class P>
-  static void on_belongs_to(const char * /*id*/, P &, const utils::foreign_attributes & ) {}
+  static void on_belongs_to(const char * /*id*/, P &, const foreign_attributes & ) {}
   template<class P>
-  static void on_has_one(const char * /*id*/, P &, const utils::foreign_attributes & ) {}
+  static void on_has_one(const char * /*id*/, P &, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many(const char * /*id*/, C &, const char * /*join_column*/, const utils::foreign_attributes & ) {}
+  static void on_has_many(const char * /*id*/, C &, const char * /*join_column*/, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many_to_many(const char * /*id*/, C &, const char * /*join_column*/, const char * /*inverse_join_column*/, const utils::foreign_attributes & ) {}
+  static void on_has_many_to_many(const char * /*id*/, C &, const char * /*join_column*/, const char * /*inverse_join_column*/, const foreign_attributes & ) {}
   template<class C>
-  static void on_has_many_to_many(const char * /*id*/, C &, const utils::foreign_attributes & ) {}
+  static void on_has_many_to_many(const char * /*id*/, C &, const foreign_attributes & ) {}
+
+  identifier pk_;
 };
 
 }
 
-template<typename PrimaryKeyType>
 class primary_key_accessor {
 public:
+  template<class Type>
+  identifier get(const Type &obj) {
+    access::process(pk_getter_, obj);
+    return pk_getter_.pk_;
+  }
+
+  template<class Type>
+  void set(Type &obj, const identifier &pk) {
+    pk_setter_.set(obj, pk);
+  }
+
+  template<class Type>
+  bool is_set(const Type &obj) {
+    access::process(pk_unset_checker_, obj);
+    return !pk_unset_checker_.unset;
+  }
+
+private:
+  detail::primary_key_setter pk_setter_;
+  detail::pk_unset_checker pk_unset_checker_;
+  detail::primary_key_getter pk_getter_;
 
-  PrimaryKeyType get() const;
-  PrimaryKeyType
 };
 }