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

include/matador/object/attribute_definition_generator.hpp

@@ -7,6 +7,7 @@
 #include "matador/utils/data_type_traits.hpp"
 #include "matador/utils/error.hpp"
 #include "matador/utils/field_attributes.hpp"
+#include "matador/utils/primary_key_attribute.hpp"
 
 
 #include <memory>
@@ -29,10 +30,9 @@ public:
   }
 
   template<typename ValueType>
-  void on_primary_key(const char *, ValueType &/*pk*/, std::enable_if_t<std::is_integral_v<ValueType> && !std::is_same_v<bool, ValueType>>* = nullptr) {
-    type_ = utils::data_type_traits<ValueType>::type(0);
+  void on_primary_key(const char *, ValueType &/*pk*/, const utils::primary_key_attribute& attr = utils::default_pk_attributes) {
+    type_ = utils::data_type_traits<ValueType>::type(attr.size());
   }
-  void on_primary_key(const char * /*id*/, std::string &/*pk*/, size_t size);
   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*/ = utils::null_attributes) {}
@@ -77,9 +77,8 @@ public:
     return columns;
   }
 
-  template < class V >
-  void on_primary_key(const char *, V &x, std::enable_if_t<std::is_integral_v<V> && !std::is_same_v<bool, V>>* = nullptr);
-  void on_primary_key(const char *id, std::string &pk, size_t size);
+  template < class Type >
+  void on_primary_key(const char *, Type &x, const utils::primary_key_attribute& attr = utils::default_pk_attributes);
   void on_revision(const char *id, uint64_t &rev);
 
   template<typename Type>
@@ -133,10 +132,9 @@ private:
   fk_attribute_generator fk_column_generator_;
 };
 
-template<typename V>
-void attribute_definition_generator::on_primary_key(const char *id, V &x, std::enable_if_t<std::is_integral_v<V> && !std::is_same_v<bool, V>>*)
-{
-  on_attribute(id, x, { utils::constraints::PRIMARY_KEY });
+template<typename ValueType>
+void attribute_definition_generator::on_primary_key(const char *id, ValueType &x, const utils::primary_key_attribute& attr) {
+  on_attribute(id, x, { attr.size(), utils::constraints::PRIMARY_KEY });
 }
 
 template<typename Type>

include/matador/object/foreign_node_completer.hpp

@@ -6,6 +6,8 @@
 #include "matador/object/join_columns_collector.hpp"
 #include "matador/object/object_ptr.hpp"
 
+#include "matador/utils/primary_key_attribute.hpp"
+
 #include "matador/logger/log_manager.hpp"
 
 #include <stack>
@@ -33,8 +35,7 @@ public:
     }
 
     template<class PrimaryKeyType>
-    static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, std::enable_if_t<std::is_integral_v<PrimaryKeyType> && !std::is_same_v<bool, PrimaryKeyType>> * = nullptr) {}
-    static void on_primary_key(const char * /*id*/, std::string &/*pk*/, size_t /*size*/) {}
+    static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {}
     static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
     template<typename AttributeType>
     static void on_attribute(const char * /*id*/, AttributeType &/*val*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}

include/matador/object/join_columns_collector.hpp

@@ -3,6 +3,7 @@
 
 #include "matador/utils/access.hpp"
 #include "matador/utils/field_attributes.hpp"
+#include "matador/utils/primary_key_attribute.hpp"
 
 #include <string>
 
@@ -24,8 +25,7 @@ public:
         return join_columns_;
     }
     template < class V >
-    void on_primary_key(const char * /*id*/, V &, std::enable_if_t<std::is_integral_v<V> && !std::is_same_v<bool, V>>* = nullptr) {}
-    static void on_primary_key(const char * /*id*/, std::string &, size_t) {}
+    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*/, unsigned long long &/*rev*/) {}
     template<typename Type>
     static void on_attribute(const char * /*id*/, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}

include/matador/object/primary_key_resolver.hpp

@@ -5,6 +5,7 @@
 #include "matador/utils/field_attributes.hpp"
 #include "matador/utils/foreign_attributes.hpp"
 #include "matador/utils/identifier.hpp"
+#include "matador/utils/primary_key_attribute.hpp"
 
 #include <cstdint>
 #include <string>
@@ -42,14 +43,12 @@ public:
   }
 
   template < class Type >
-  void on_primary_key(const char *id, Type &pk, std::enable_if_t<std::is_integral_v<Type> && !std::is_same_v<bool, Type>>* = nullptr) {
+  void on_primary_key(const char *id, Type &pk, const utils::primary_key_attribute& attr = utils::default_pk_attributes) {
     primary_key_info_.pk_column_name = id;
-    primary_key_info_.type = utils::data_type_traits<Type>::type();
+    primary_key_info_.type = utils::data_type_traits<Type>::type(attr.size());
     primary_key_info_.pk = pk;
   }
 
-  void on_primary_key(const char *id, const std::string &pk, size_t size);
-
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
   template<typename Type>
   static void on_attribute(const char * /*id*/, Type &/*val*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}

include/matador/object/relation_completer.hpp

@@ -9,6 +9,8 @@
 
 #include "matador/logger/log_manager.hpp"
 
+#include "matador/utils/primary_key_attribute.hpp"
+
 #include <iostream>
 #include <stack>
 #include <utility>
@@ -27,8 +29,7 @@ public:
     }
 
     template<class PrimaryKeyType>
-    static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, std::enable_if_t<std::is_integral_v<PrimaryKeyType> && !std::is_same_v<bool, PrimaryKeyType>> * = nullptr) {}
-    static void on_primary_key(const char * /*id*/, std::string &/*pk*/, size_t /*size*/) {}
+    static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {}
     static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
     template<typename AttributeType>
     static void on_attribute(const char * /*id*/, AttributeType &/*val*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}
@@ -106,8 +107,7 @@ public:
   }
 
   template<class PrimaryKeyType>
-  static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, std::enable_if_t<std::is_integral_v<PrimaryKeyType> && !std::is_same_v<bool, PrimaryKeyType>> * = nullptr) {}
-  static void on_primary_key(const char * /*id*/, std::string &/*pk*/, size_t /*size*/) {}
+  static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {}
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
   template<typename AttributeType>
   static void on_attribute(const char * /*id*/, AttributeType &/*val*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}