changed the interface of on_primary_key to have a third parameter of type primary_key_attribute

source/core/CMakeLists.txt

@@ -57,6 +57,7 @@ add_library(matador-core STATIC
   ../../include/matador/utils/os.hpp
   ../../include/matador/utils/placeholder.hpp
   ../../include/matador/utils/primary_key_attribute.hpp
+  ../../include/matador/utils/primary_key_generator_type.hpp
   ../../include/matador/utils/result.hpp
   ../../include/matador/utils/singleton.hpp
   ../../include/matador/utils/string.hpp
@@ -79,7 +80,6 @@ add_library(matador-core STATIC
   object/foreign_node_completer.cpp
   object/internal/shadow_schema.cpp
   object/object_definition.cpp
-  object/primary_key_resolver.cpp
   object/relation_endpoint.cpp
   object/schema.cpp
   object/schema_node.cpp

source/core/object/attribute_definition_generator.cpp

@@ -8,11 +8,6 @@ attribute_definition_generator::attribute_definition_generator(std::vector<objec
 , repo_(repo)
 {}
 
-void attribute_definition_generator::on_primary_key(const char *id, std::string &pk, size_t size)
-{
-    on_attribute(id, pk, { size, utils::constraints::PRIMARY_KEY });
-}
-
 void attribute_definition_generator::on_revision(const char *id, uint64_t &rev)
 {
     on_attribute(id, rev);
@@ -26,9 +21,4 @@ void attribute_definition_generator::insert_missing_reference_column(const std::
   const_cast<schema&>(repo_).missing_references_.insert({ti, ref_column});
 }
 
-void fk_attribute_generator::on_primary_key(const char *, std::string &, const size_t size)
-{
-    type_ = utils::data_type_traits<std::string>::type(size);
-}
-
 }

source/core/object/primary_key_resolver.cpp

@@ -1,10 +0,0 @@
-#include "matador/object/primary_key_resolver.hpp"
-
-namespace matador::object {
-void primary_key_resolver::on_primary_key(const char *id, const std::string &pk, size_t /*size*/) {
-  primary_key_info_.pk_column_name = id;
-  primary_key_info_.type = utils::basic_type::type_varchar;
-  primary_key_info_.pk = pk;
-}
-
-}

source/core/utils/default_type_traits.cpp

@@ -5,159 +5,129 @@
 
 namespace matador::utils {
 
-void data_type_traits<nullptr_t>::read_value(attribute_reader &/*reader*/, const char * /*id*/, size_t /*index*/, nullptr_t &/*value*/)
+void data_type_traits<nullptr_t>::read_value(attribute_reader &/*reader*/, const char * /*id*/, size_t /*index*/, nullptr_t &/*value*/, const size_t /*size*/)
 {}
 
-void data_type_traits<nullptr_t>::bind_value(attribute_writer &/*binder*/, size_t /*index*/, nullptr_t &/*value*/)
+void data_type_traits<nullptr_t>::bind_value(attribute_writer &/*binder*/, size_t /*index*/, nullptr_t &/*value*/, const size_t /*size*/)
 {}
 
-void data_type_traits<int8_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int8_t &value)
-{
+void data_type_traits<int8_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int8_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<int8_t>::bind_value(attribute_writer &binder, const size_t index, const int8_t &value)
-{
+void data_type_traits<int8_t>::bind_value(attribute_writer &binder, const size_t index, const int8_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<int16_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int16_t &value)
-{
+void data_type_traits<int16_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int16_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<int16_t>::bind_value(attribute_writer &binder, const size_t index, const int16_t &value)
-{
+void data_type_traits<int16_t>::bind_value(attribute_writer &binder, const size_t index, const int16_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<int32_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int32_t &value)
-{
+void data_type_traits<int32_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int32_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<int32_t>::bind_value(attribute_writer &binder, const size_t index, const int32_t &value)
-{
+void data_type_traits<int32_t>::bind_value(attribute_writer &binder, const size_t index, const int32_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<int64_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int64_t &value)
-{
+void data_type_traits<int64_t>::read_value(attribute_reader &reader, const char *id, const size_t index, int64_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<int64_t>::bind_value(attribute_writer &binder, const size_t index, const int64_t &value)
-{
+void data_type_traits<int64_t>::bind_value(attribute_writer &binder, const size_t index, const int64_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<uint8_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint8_t &value)
-{
+void data_type_traits<uint8_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint8_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<uint8_t>::bind_value(attribute_writer &binder, const size_t index, const uint8_t &value)
-{
+void data_type_traits<uint8_t>::bind_value(attribute_writer &binder, const size_t index, const uint8_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<uint16_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint16_t &value)
-{
+void data_type_traits<uint16_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint16_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<uint16_t>::bind_value(attribute_writer &binder, const size_t index, const uint16_t &value)
-{
+void data_type_traits<uint16_t>::bind_value(attribute_writer &binder, const size_t index, const uint16_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<uint32_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint32_t &value)
-{
+void data_type_traits<uint32_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint32_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<uint32_t>::bind_value(attribute_writer &binder, const size_t index, const uint32_t &value)
-{
+void data_type_traits<uint32_t>::bind_value(attribute_writer &binder, const size_t index, const uint32_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<uint64_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint64_t &value)
-{
+void data_type_traits<uint64_t>::read_value(attribute_reader &reader, const char *id, const size_t index, uint64_t &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<uint64_t>::bind_value(attribute_writer &binder, const size_t index, const uint64_t &value)
-{
+void data_type_traits<uint64_t>::bind_value(attribute_writer &binder, const size_t index, const uint64_t &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<bool>::read_value(attribute_reader &reader, const char *id, const size_t index, bool &value)
-{
+void data_type_traits<bool>::read_value(attribute_reader &reader, const char *id, const size_t index, bool &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<bool>::bind_value(attribute_writer &binder, const size_t index, const bool &value)
-{
+void data_type_traits<bool>::bind_value(attribute_writer &binder, const size_t index, const bool &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<float>::read_value(attribute_reader &reader, const char *id, const size_t index, float &value)
-{
+void data_type_traits<float>::read_value(attribute_reader &reader, const char *id, const size_t index, float &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<float>::bind_value(attribute_writer &binder, const size_t index, const float &value)
-{
+void data_type_traits<float>::bind_value(attribute_writer &binder, const size_t index, const float &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<double>::read_value(attribute_reader &reader, const char *id, const size_t index, double &value)
-{
+void data_type_traits<double>::read_value(attribute_reader &reader, const char *id, const size_t index, double &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<double>::bind_value(attribute_writer &binder, const size_t index, const double &value)
-{
+void data_type_traits<double>::bind_value(attribute_writer &binder, const size_t index, const double &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 
-void data_type_traits<const char*>::read_value(attribute_reader &reader, const char *id, const size_t index, const char* value, const size_t size)
-{
+void data_type_traits<const char*>::read_value(attribute_reader &reader, const char *id, const size_t index, const char* value, const size_t size) {
   reader.read_value(id, index, const_cast<char*>(value), size);
 }
 
-void data_type_traits<const char *>::bind_value(attribute_writer &binder, const size_t index, const char *value, const size_t size)
-{
+void data_type_traits<const char *>::bind_value(attribute_writer &binder, const size_t index, const char *value, const size_t size) {
   binder.write_value(index, value, size);
 }
 
-void data_type_traits<char*>::read_value(attribute_reader &reader, const char *id, const size_t index, char* value, const size_t size)
-{
+void data_type_traits<char*>::read_value(attribute_reader &reader, const char *id, const size_t index, char* value, const size_t size) {
   reader.read_value(id, index, value, size);
 }
 
-void data_type_traits<char *>::bind_value(attribute_writer &binder, const size_t index, const char *value, const size_t size)
-{
+void data_type_traits<char *>::bind_value(attribute_writer &binder, const size_t index, const char *value, const size_t size) {
   binder.write_value(index, value, size);
 }
 
-void data_type_traits<std::string>::read_value(attribute_reader &reader, const char *id, size_t index, std::string &value, size_t size)
-{
+void data_type_traits<std::string>::read_value(attribute_reader &reader, const char *id, const size_t index, std::string &value, const size_t size) {
   reader.read_value(id, index, value, size);
 }
 
-void data_type_traits<std::string>::bind_value(attribute_writer &binder, size_t index, std::string &value, size_t size)
-{
+void data_type_traits<std::string>::bind_value(attribute_writer &binder, const size_t index, std::string &value, const size_t size) {
   binder.write_value(index, value, size);
 }
 
-void data_type_traits<utils::blob, void>::read_value(attribute_reader &reader, const char *id, size_t index, utils::blob &value)
-{
+void data_type_traits<blob>::read_value(attribute_reader &reader, const char *id, const size_t index, utils::blob &value, const size_t /*size*/) {
   reader.read_value(id, index, value);
 }
 
-void data_type_traits<utils::blob, void>::bind_value(attribute_writer &binder, size_t index, utils::blob &value)
-{
+void data_type_traits<blob>::bind_value(attribute_writer &binder, const size_t index, utils::blob &value, const size_t /*size*/) {
   binder.write_value(index, value);
 }
 

source/core/utils/primary_key_attribute.cpp

@@ -2,14 +2,31 @@
 
 namespace matador::utils {
 primary_key_attribute::primary_key_attribute(const size_t size)
-: size_(size) {}
+: size_( size ) {}
+
+primary_key_attribute::primary_key_attribute(const generator_type generator)
+: generator_( generator ) {}
+
+primary_key_attribute::primary_key_attribute(const size_t size, const generator_type generator)
+: size_( size )
+, generator_( generator ) {}
 
 primary_key_attribute& primary_key_attribute::operator=(const size_t size) {
-    size_ = size;
-    return *this;
+  size_ = size;
+  return *this;
+}
+
+primary_key_attribute& primary_key_attribute::operator=(const generator_type generator) {
+  generator_ = generator;
+  return *this;
 }
 
 size_t primary_key_attribute::size() const {
-    return size_;
+  return size_;
 }
+
+generator_type primary_key_attribute::generator() const {
+  return generator_;
+}
+
 }