backends/postgres/src/postgres_connection.cpp

@@ -281,7 +281,7 @@ utils::result<std::vector<object::attribute>, utils::error> postgres_connection:
       null_opt = object::null_option_type::NotNull;
     }
     // f.default_value(res->column(4));
-    prototype.emplace_back(name, type, NullAttributes, null_opt);
+    prototype.emplace_back(name, type, utils::NullAttributes, null_opt);
   }
 
   return utils::ok(prototype);

demo/author.hpp

@@ -20,15 +20,14 @@ struct author {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::primary_key( op, "id", id );
-        field::attribute( op, "first_name", first_name, VarChar63 );
-        field::attribute( op, "last_name", last_name, VarChar63 );
-        field::attribute( op, "date_of_birth", date_of_birth, VarChar63 );
+        field::attribute( op, "first_name", first_name, 63 );
+        field::attribute( op, "last_name", last_name, 63 );
+        field::attribute( op, "date_of_birth", date_of_birth, 31 );
         field::attribute( op, "year_of_birth", year_of_birth );
         field::attribute( op, "distinguished", distinguished );
-        field::has_many( op, "books", books, "author_id", utils::CascadeNoneFetchLazy );
+        field::has_many( op, "books", books, "author_id", matador::utils::CascadeNoneFetchLazy );
     }
 };
 }

demo/book.hpp

@@ -15,11 +15,10 @@ struct book {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::primary_key( op, "id", id );
-        field::attribute( op, "title", title, VarChar511 );
-        field::belongs_to( op, "author_id", book_author, utils::CascadeNoneFetchLazy );
+        field::attribute( op, "title", title, 511 );
+        field::belongs_to( op, "author_id", book_author, matador::utils::CascadeNoneFetchLazy );
         field::attribute( op, "published_in", published_in );
     }
 };

demo/object.cpp

@@ -29,7 +29,7 @@ public:
   attribute() = default;
   attribute(std::string name,
             utils::basic_type type,
-            const utils::field_attributes& opts = matador::NullAttributes,
+            const utils::field_attributes& opts = utils::NullAttributes,
             null_option_type null_opt = null_option_type::NotNull)
   : name_(std::move(name)), type_(type), options_(opts), null_option_type_(null_opt) {}
 

demo/recipe.hpp

@@ -13,7 +13,8 @@
 namespace demo {
 
 struct recipe;
-struct ingredient {
+struct ingredient
+{
   unsigned int id{};
   std::string name;
   matador::object::collection<matador::object::object_ptr<demo::recipe>> recipes{};
@@ -24,15 +25,15 @@ struct ingredient {
 
   template<class Operator>
   void process(Operator &op) {
-    using namespace matador;
-    namespace field = access;
+    namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, VarChar255);
-    field::has_many_to_many(op, "recipe_ingredients", recipes, "ingredient_id", "recipe_id", utils::CascadeAllFetchEager);
+    field::attribute(op, "name", name, 255);
+    field::has_many_to_many(op, "recipe_ingredients", recipes, "ingredient_id", "recipe_id", matador::utils::fetch_type::Eager);
   }
 };
 
-struct recipe {
+struct recipe
+{
   unsigned int id{};
   std::string name;
   matador::object::collection<matador::object::object_ptr<demo::ingredient>> ingredients{};
@@ -43,11 +44,10 @@ struct recipe {
 
   template<class Operator>
   void process(Operator &op) {
-    using namespace matador;
-    namespace field = access;
+    namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, VarChar255);
-    field::has_many_to_many(op, "recipe_ingredients", ingredients, utils::CascadeAllFetchLazy);
+    field::attribute(op, "name", name, 255);
+    field::has_many_to_many(op, "recipe_ingredients", ingredients, matador::utils::fetch_type::Lazy);
   }
 };
 

demo/sandbox.cpp

@@ -81,12 +81,11 @@ struct profile {
 
     template<typename Operator>
     void process(Operator &op) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::primary_key( op, "id", id );
-        field::attribute( op, "first_name", first_name, VarChar255 );
-        field::attribute( op, "last_name", last_name, VarChar255 );
-        field::belongs_to( op, "user_id", user, utils::CascadeNoneFetchLazy );
+        field::attribute( op, "first_name", first_name, 255 );
+        field::attribute( op, "last_name", last_name, 255 );
+        field::belongs_to( op, "user_id", user, matador::utils::CascadeNoneFetchLazy );
     }
 };
 struct user {
@@ -96,11 +95,10 @@ struct user {
 
     template<typename Operator>
     void process(Operator &op) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::primary_key( op, "id", id );
-        field::attribute( op, "username", username, VarChar255 );
-        field::has_one(op, "profile_id", profile, utils::CascadeNoneFetchLazy );
+        field::attribute( op, "username", username, 255 );
+        field::has_one(op, "profile_id", profile, matador::utils::CascadeNoneFetchLazy );
     }
 };
 
@@ -110,10 +108,9 @@ struct person {
 
     template<typename Operator>
     void process(Operator &op) {
-        using namespace matador;
         namespace field = matador::access;
         field::primary_key( op, "id", id );
-        field::attribute( op, "name", name, VarChar255 );
+        field::attribute( op, "name", name, 255 );
     }
 };
 

demo/work/admin/CollectionCenter.hpp

@@ -36,13 +36,12 @@ struct CollectionCenter : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
         namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "name", name, UniqueVarChar511 );
+        field::attribute( op, "name", name, 511 );
         field::attribute( op, "symbol", symbol );
         field::attribute( op, "type", type );
-        field::has_many( op, "collection_center_users", users, "users_id", utils::CascadeAllFetchLazy );
+        field::has_many( op, "collection_center_users", users, "users_id", matador::utils::fetch_type::Lazy );
     }
 };
 

demo/work/admin/InternalUserDirectory.hpp

@@ -15,4 +15,4 @@ struct InternalUserDirectory : UserDirectory {
 };
 }
 
-#endif //INTERNAL_USER_DIRECTORY_HPP
+#endif //INTERNALUSERDIRECTORY_HPP

demo/work/admin/LdapGroupSchemaSettings.hpp

@@ -16,12 +16,11 @@ struct LdapGroupSchemaSettings : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::has_one(op, "ldap_user_directory", ldap_user_directory, utils::CascadeAllFetchLazy);
-        field::attribute( op, "group_object_filter", group_object_filter, VarChar511 );
-        field::attribute( op, "user_member_attribute", user_member_attribute, VarChar511 );
+        field::has_one(op, "ldap_user_directory", ldap_user_directory, matador::utils::CascadeAllFetchLazy);
+        field::attribute( op, "group_object_filter", group_object_filter, 511 );
+        field::attribute( op, "user_member_attribute", user_member_attribute, 511 );
     }
 };
 

demo/work/admin/LdapImportSettings.hpp

@@ -17,11 +17,10 @@ struct LdapImportSettings : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::has_one(op, "ldap_user_directory", ldap_user_directory, utils::CascadeAllFetchLazy);
-        field::attribute( op, "default_role", default_role, VarChar511 );
+        field::has_one(op, "ldap_user_directory", ldap_user_directory, matador::utils::CascadeAllFetchLazy);
+        field::attribute( op, "default_role", default_role, 511 );
         field::attribute( op, "sync_interval", sync_interval );
         field::attribute( op, "network_timeout", network_timeout );
     }

demo/work/admin/LdapUserDirectory.hpp

@@ -25,17 +25,16 @@ struct LdapUserDirectory : UserDirectory {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process( op, *matador::base_class<UserDirectory>( this ) );
-        field::attribute( op, "schema_base_dn", schema_base_dn, VarChar511 );
-        field::attribute( op, "additional_user_base_dn", additional_user_base_dn, VarChar511 );
-        field::attribute( op, "additional_group_base_dn", additional_group_base_dn, VarChar511 );
-        field::belongs_to( op, "user_schema_settings", user_schema_settings, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "group_schema_settings", group_schema_settings, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "import_settings", import_settings, utils::CascadeAllFetchLazy );
-        field::has_many( op, "ldap_users", users, "users_id", utils::CascadeAllFetchEager );
-        field::has_many( op, "ldap_groups", groups, "groups_id", utils::CascadeAllFetchEager );
+        field::attribute( op, "schema_base_dn", schema_base_dn, 511 );
+        field::attribute( op, "additional_user_base_dn", additional_user_base_dn, 511 );
+        field::attribute( op, "additional_group_base_dn", additional_group_base_dn, 511 );
+        field::belongs_to( op, "user_schema_settings", user_schema_settings, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "group_schema_settings", group_schema_settings, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "import_settings", import_settings, matador::utils::CascadeAllFetchLazy );
+        field::has_many( op, "ldap_users", users, "users_id", matador::utils::CascadeAllFetchEager );
+        field::has_many( op, "ldap_groups", groups, "groups_id", matador::utils::CascadeAllFetchEager );
     }
 };
 }

demo/work/admin/LdapUserSchemaSettings.hpp

@@ -18,14 +18,13 @@ struct LdapUserSchemaSettings : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process(op, *matador::base_class<Model>( this ));
-        field::has_one(op, "ldap_user_directory", ldap_user_directory, utils::CascadeAllFetchLazy);
-        field::attribute(op, "user_object_filter", user_object_filter, VarChar511);
-        field::attribute(op, "user_unique_id_attribute", user_unique_id_attribute, VarChar511);
-        field::attribute(op, "user_member_of_attribute", user_member_of_attribute, VarChar511);
-        field::attribute(op, "user_name_attribute", user_name_attribute, VarChar511);
+        field::has_one(op, "ldap_user_directory", ldap_user_directory, matador::utils::CascadeAllFetchLazy);
+        field::attribute(op, "user_object_filter", user_object_filter, 511);
+        field::attribute(op, "user_unique_id_attribute", user_unique_id_attribute, 511);
+        field::attribute(op, "user_member_of_attribute", user_member_of_attribute, 511);
+        field::attribute(op, "user_name_attribute", user_name_attribute, 511);
     }
 };
 

demo/work/admin/LoginHistory.hpp

@@ -51,14 +51,13 @@ struct LoginHistory : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process_base<Model>( op, *this );
         field::process( op, *matador::base_class<Model>( this ) );
-        field::belongs_to( op, "client", client, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "scenario", scenario, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "collection_center", collection_center, utils::CascadeAllFetchLazy );
-        field::attribute( op, "login_name", login_name, VarChar511 );
+        field::belongs_to( op, "client", client, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "scenario", scenario, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "collection_center", collection_center, matador::utils::CascadeAllFetchLazy );
+        field::attribute( op, "login_name", login_name, 511 );
         field::attribute( op, "fail_reason", fail_reason );
         field::attribute( op, "login_time", login_time );
     }

demo/work/admin/Scenario.hpp

@@ -46,15 +46,14 @@ struct Scenario : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "name", name, UniqueVarChar511 );
+        field::attribute( op, "name", name, 511 );
         field::attribute( op, "mode", mode );
-        field::attribute( op, "description", description, VarChar511 );
+        field::attribute( op, "description", description, 511 );
         field::attribute( op, "symbol", symbol );
         field::attribute( op, "state", state );
-        field::has_many( op, "collection_center", collection_center, "scenario_id", utils::CascadeAllFetchLazy );
+        field::has_many( op, "collection_center", collection_center, "scenario_id", matador::utils::fetch_type::Lazy );
     }
 };
 }

demo/work/admin/User.hpp

@@ -29,18 +29,17 @@ struct User : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "name", name, UniqueVarChar511 );
+        field::attribute( op, "name", name, 511 );
         field::attribute( op, "symbol", symbol );
-        field::attribute( op, "salt", salt, VarChar511 );
-        field::attribute( op, "password", password, VarChar511 );
+        field::attribute( op, "salt", salt, 511 );
+        field::attribute( op, "password", password, 511 );
         field::attribute( op, "lock_type", lock_type );
         field::attribute( op, "locked_at", locked_at );
-        field::attribute( op, "lock_reason", lock_reason, VarChar511 );
-        field::attribute( op, "role", role, VarChar63 );
-        field::belongs_to( op, "user_directory", user_directory, utils::CascadeAllFetchLazy );
+        field::attribute( op, "lock_reason", lock_reason, 511 );
+        field::attribute( op, "role", role, 63 );
+        field::belongs_to( op, "user_directory", user_directory, matador::utils::CascadeAllFetchLazy );
     }
 };
 

demo/work/admin/UserDirectory.hpp

@@ -13,7 +13,7 @@ struct UserDirectory : core::Model {
     void process( Operator& op ) {
         namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "name", name, matador::VarChar511 );
+        field::attribute( op, "name", name, 511 );
     }
 };
 }

demo/work/admin/UserSession.hpp

@@ -21,12 +21,11 @@ struct UserSession : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
-        namespace field = access;
+        namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::belongs_to( op, "client", client, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "scenario", scenario, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "collection_center", collection_center, utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "client", client, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "scenario", scenario, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "collection_center", collection_center, matador::utils::CascadeAllFetchLazy );
         field::attribute( op, "offline_since", offline_since );
     }
 };

demo/work/core/UserInfo.hpp

@@ -2,7 +2,6 @@
 #define USERINFO_HPP
 
 #include "matador/utils/access.hpp"
-#include "matador/utils/field_attributes.hpp"
 
 namespace work::core {
 struct UserInfo {
@@ -13,10 +12,9 @@ struct UserInfo {
     template<typename Operator>
     void process( Operator& op ) {
         namespace field = matador::access;
-        using namespace matador;
         field::attribute( op, "user_session_id", user_session_id );
-        field::attribute( op, "user_role", user_role, VarChar255 );
-        field::attribute( op, "database_name", database_name, VarChar255 );
+        field::attribute( op, "user_role", user_role, 255 );
+        field::attribute( op, "database_name", database_name, 255 );
     }
 };
 }

demo/work/jobs/Job.hpp

@@ -30,16 +30,15 @@ struct Job : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
         namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "name", name, UniqueVarChar511 );
-        field::attribute( op, "description", description, VarChar1023 );
+        field::attribute( op, "name", name, 511 );
+        field::attribute( op, "description", description, 511 );
         field::attribute( op, "state", state );
         field::attribute( op, "mode", mode );
         field::attribute( op, "created_at", created_at );
-        field::has_one(op, "payload", payload, utils::CascadeAllFetchLazy );
-        field::belongs_to( op, "task", task, utils::CascadeAllFetchLazy );
+        field::has_one(op, "payload", payload, matador::utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "task", task, matador::utils::CascadeAllFetchLazy );
         field::attribute( op, "user_info", user_info );
     }
 };

demo/work/jobs/Payload.hpp

@@ -16,11 +16,10 @@ struct Payload : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
         namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "type", type, VarChar255 );
-        field::belongs_to( op, "job", job, utils::CascadeAllFetchLazy );
+        field::attribute( op, "type", type, 255 );
+        field::belongs_to( op, "job", job, matador::utils::CascadeAllFetchLazy );
     }
 };
 }

demo/work/jobs/Task.hpp

@@ -26,14 +26,13 @@ struct Task : core::Model {
 
     template<typename Operator>
     void process( Operator& op ) {
-        using namespace matador;
         namespace field = matador::access;
         field::process( op, *matador::base_class<Model>( this ) );
-        field::attribute( op, "name", name, UniqueVarChar511 );
-        field::attribute( op, "description", description, VarChar1023 );
-        field::attribute( op, "job_name", job_name, VarChar511 );
+        field::attribute( op, "name", name, 511 );
+        field::attribute( op, "description", description, 511 );
+        field::attribute( op, "job_name", job_name, 511 );
         field::attribute( op, "state", state );
-        field::belongs_to( op, "payload", payload, utils::CascadeAllFetchLazy );
+        field::belongs_to( op, "payload", payload, matador::utils::CascadeAllFetchLazy );
         field::attribute( op, "job_mode", job_mode );
         field::attribute( op, "start_delay", start_delay );
         field::attribute( op, "interval", interval );

include/matador/object/attribute.hpp

@@ -28,7 +28,7 @@ public:
   attribute() = default;
   attribute(std::string name,
             utils::basic_type type,
-            const utils::field_attributes &attr = NullAttributes,
+            const utils::field_attributes &attr = utils::NullAttributes,
             null_option_type null_opt = null_option_type::NotNull);
 
   [[nodiscard]] const std::string& name() const;
@@ -39,9 +39,9 @@ public:
   [[nodiscard]] bool is_nullable() const;
   [[nodiscard]] utils::basic_type type() const;
   [[nodiscard]] std::shared_ptr<object> owner() const;
-  void change_type(utils::basic_type type, const utils::field_attributes &attr = NullAttributes);
+  void change_type(utils::basic_type type, const utils::field_attributes &attr = utils::NullAttributes);
   template < typename Type >
-  void change_type(const utils::field_attributes &attr = NullAttributes) {
+  void change_type(const utils::field_attributes &attr = utils::NullAttributes) {
       type_ = utils::data_type_traits<Type>::type(attr.size());
   }
 

include/matador/object/foreign_node_completer.hpp

@@ -38,8 +38,6 @@ public:
     completer.complete_node(node);
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class PrimaryKeyType>
   static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, const utils::primary_key_attribute & /*attr*/) {}
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}

include/matador/object/join_columns_collector.hpp

@@ -24,8 +24,6 @@ public:
 
         return join_columns_;
     }
-    template<typename BaseType>
-    static void on_base(const BaseType&) {}
     template < class V >
     static void on_primary_key(const char * /*id*/, V &, const utils::primary_key_attribute& /*attr*/) {}
     static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}

include/matador/object/object_generator.hpp

@@ -74,8 +74,6 @@ public:
         return obj;
     }
 
-    template<typename BaseType>
-    static void on_base(const BaseType&) {}
     template < class Type >
     void on_primary_key(const char *, Type &x, const utils::primary_key_attribute& attr);
     void on_revision(const char *id, uint64_t &rev);

include/matador/object/object_ptr.hpp

@@ -8,18 +8,11 @@
 #include <memory>
 
 namespace matador::object {
-struct null_object_ptr_t {
-  constexpr null_object_ptr_t() = default;
-};
-
-inline constexpr null_object_ptr_t nullobj{};
-
 template <typename Type>
 class object_ptr {
 public:
   object_ptr()
   : proxy_(std::make_shared<object_proxy<Type>>()) {}
-  object_ptr(null_object_ptr_t) {}
   explicit object_ptr(std::shared_ptr<Type> obj)
   : proxy_(std::make_shared<object_proxy<Type>>(obj)) {}
   explicit object_ptr(std::shared_ptr<object_proxy<Type>> obj)
@@ -28,19 +21,11 @@ public:
   object_ptr(object_ptr &&other) noexcept = default;
   object_ptr &operator=(const object_ptr &other) = default;
   object_ptr &operator=(object_ptr &&other) = default;
-  object_ptr& operator=(null_object_ptr_t) {
-    proxy_.reset();
-    return *this;
-  }
 
   bool operator==(const object_ptr &other) const {
     return get() == other.get();
   }
-  bool operator==(null_object_ptr_t) const {
-    return empty();
-  }
   bool operator!=(const object_ptr &other) const { return !operator==(other); }
-  bool operator!=(null_object_ptr_t) const { return !empty(); }
 
   using value_type = Type;
 
@@ -68,7 +53,7 @@ public:
   [[nodiscard]] bool is_detached() const { return proxy_->is_detached(); }
   [[nodiscard]] bool is_removed() const { return proxy_->is_removed(); }
 
-  void change_state(object_state s) const {
+  void change_state(object_state s) {
     if (proxy_) {
       proxy_->change_state(s);
     }

include/matador/object/pk_field_locator.hpp

@@ -34,8 +34,6 @@ struct pk_field_locator {
   explicit pk_field_locator (Type &obj)
   : base(&obj) {}
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template <typename PrimaryKeyType>
   void on_primary_key(const char *, PrimaryKeyType &pk, const utils::primary_key_attribute & /*attr*/) {
     // Offset bestimmen

include/matador/object/primary_key_resolver.hpp

@@ -43,8 +43,6 @@ public:
     return resolver.resolve(obj);
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class Type >
   void on_primary_key(const char *id, Type &pk, const utils::primary_key_attribute& attr) {
     primary_key_info_.pk_column_name = id;

include/matador/object/relation_completer.hpp

@@ -28,8 +28,6 @@ public:
         return finder.found_;
     }
 
-    template<typename BaseType>
-    static void on_base(const BaseType&) {}
     template<class PrimaryKeyType>
     static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, const utils::primary_key_attribute& /*attr*/) {}
     static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
@@ -104,8 +102,6 @@ public:
     completer.complete_node_relations(node);
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class PrimaryKeyType>
   static void on_primary_key(const char * /*id*/, PrimaryKeyType &/*pk*/, const utils::primary_key_attribute& /*attr*/) {}
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}

include/matador/orm/session.hpp

@@ -65,6 +65,16 @@ public:
   template<typename Type>
   utils::result<sql::query_result<Type>, utils::error> find(query::criteria_ptr clause = {});
 
+  template<typename Type>
+  utils::result<void, utils::error> drop_table() const;
+  utils::result<void, utils::error> drop_table(const std::string &table_name) const;
+
+  [[nodiscard]] utils::result<sql::query_result<sql::record>, utils::error> fetch_all(const sql::query_context &q) const;
+  [[nodiscard]] utils::result<sql::execute_result, utils::error> execute(const std::string &sql) const;
+
+  [[nodiscard]] std::vector<object::attribute> describe_table(const std::string &table_name) const;
+  [[nodiscard]] bool table_exists(const std::string &table_name) const;
+
   [[nodiscard]] utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> fetch(const sql::query_context &ctx) const override;
   [[nodiscard]] utils::result<sql::execute_result, utils::error> execute(const sql::query_context &ctx) const override;
   [[nodiscard]] utils::result<sql::statement, utils::error> prepare(const sql::query_context &ctx) override;
@@ -135,7 +145,6 @@ utils::result<object::object_ptr<Type>, utils::error> session::insert(object::ob
     } else if (const auto exec_result = result->execute(); !exec_result.is_ok()) {
       return utils::failure(exec_result.err());
     }
-    step.make_object_persistent();
   }
 
   obj.change_state(object::object_state::Persistent);
@@ -155,8 +164,6 @@ public:
     return stmt_;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class Type>
   void on_primary_key(const char * /*id*/, Type &x, const utils::primary_key_attribute & /*attr*/) {
     stmt_.bind(binding_position_, x);
@@ -303,5 +310,15 @@ utils::result<sql::query_result<Type>, utils::error> session::find(query::criter
 
   return result->template fetch<Type>();
 }
+
+template<typename Type>
+utils::result<void, utils::error> session::drop_table() const {
+  const auto it = schema_.find(typeid(Type));
+  if (it == schema_.end()) {
+    return utils::failure(make_error(error_code::UnknownType, "Failed to determine requested type."));
+  }
+  return drop_table(it->second.name());
+}
+
 }
 #endif //QUERY_SESSION_HPP

include/matador/query/basic_schema.hpp

@@ -40,8 +40,6 @@ public:
 
     return generator_type_;
   }
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class V>
   void on_primary_key(const char * /*id*/, V &/*pk*/, const utils::primary_key_attribute &attr) {
     generator_type_ = attr.generator();

include/matador/query/dependency_collector.hpp

@@ -59,8 +59,6 @@ struct meta_registry {
 struct dependency_collector {
   std::vector<fk_ref> refs;
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class V>
   static void on_primary_key(const char*, V&, const utils::primary_key_attribute& /*attr*/) {}
 

include/matador/query/fk_value_extractor.hpp

@@ -24,8 +24,6 @@ public:
     return value_;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   void on_primary_key(const char *, ValueType &pk, const utils::primary_key_attribute& /*attr*/) {
     value_ = pk;

include/matador/query/generator.hpp

@@ -63,8 +63,6 @@ public:
     return result_;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class V >
   void on_primary_key(const char *id, V &, const utils::primary_key_attribute& /*attr*/) {
       push(id);
@@ -171,8 +169,6 @@ public:
     return result_;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class V >
   void on_primary_key(const char * /*id*/, V &/*x*/, const utils::primary_key_attribute& /*attr*/) {
     result_.emplace_back(utils::_);
@@ -231,8 +227,6 @@ public:
       return std::move(result_);
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class V >
   void on_primary_key(const char *id, V &x, const utils::primary_key_attribute& /*attr*/) {
     push_back(id, x);

include/matador/query/insert_query_builder.hpp

@@ -23,8 +23,6 @@ class has_many_linker {
 public:
   has_many_linker(const object::object_ptr<ObjectType> &ptr, std::string join_column)
   : ptr_(ptr), join_column_(std::move(join_column)) {}
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class PrimaryKeyType >
   static void on_primary_key(const char * /*id*/, PrimaryKeyType &, const utils::primary_key_attribute& /*attr*/) {}
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
@@ -66,7 +64,6 @@ struct insert_step {
   std::function<void(const sql::record &)> apply_returning{};
   std::function<void(const utils::identifier &)> apply_primary_key{};
   std::function<void(sql::statement &)> bind_object{};
-  std::function<void()> make_object_persistent{};
 };
 
 template<class ObjectType>
@@ -142,64 +139,49 @@ public:
       return;
     }
 
-    if (processing_many_to_many_relations_.find(id) != processing_many_to_many_relations_.end()) {
-      return;
-    }
-
     const auto it = schema_.find(std::string{id});
     if (it == schema_.end()) {
       throw query_builder_exception(query_build_error::UnknownType);
     }
 
-    using relation_value_type = object::many_to_many_relation<ForeignType, ObjectType>;
+    using relation_value_type = object::many_to_many_relation<ObjectType, ForeignType>;
 
     if (std::type_index(typeid(relation_value_type)) != it->second.node().info().type_index()) {
       throw query_builder_exception(query_build_error::InvalidRelationType);
     }
 
-    const auto cit = contexts_by_type_.find(it->second.node().info().type_index());
-    if (cit == contexts_by_type_.end()) {
-      throw query_builder_exception(query_build_error::UnknownType);
-    }
-
-    const auto rel_it = processing_many_to_many_relations_.insert(id);
-    std::vector<insert_step> rel_steps;
     for (auto &obj : objects) {
       if (!obj) {
         continue;
       }
 
+      if (obj.is_persistent()) {
+        continue;
+      }
+
       // Ensure target exists as dependency (deps first)
       if (obj.is_transient()) {
         build_for(obj, relation_steps_);
       }
 
-      auto rel = object::make_object<relation_value_type>(join_column, inverse_join_column, obj, ptr_);
+      auto rel = object::make_object<relation_value_type>(join_column, inverse_join_column, ptr_, obj);
 
-      access::process(*this, *rel);
+      // Extract FK value from the foreign object
+      insert_step rel_step{};
+      // const auto pk = rel_step.pk_accessor.get(*obj);
+      // if (pk.is_valid()) {
+        // continue;
+      // }
 
-      insert_step step{};
-      step.pk_generator = utils::generator_type::None;
-      step.ctx = cit->second.insert;
-      step.bind_object = [rel](sql::statement &stmt) { stmt.bind(*rel); };
-      step.make_object_persistent = [] {};
-
-      rel_steps.push_back(std::move(step));
+      relation_steps_.push_back(std::move(rel_step));
     }
-    relation_steps_.insert(relation_steps_.end(), rel_steps.begin(), rel_steps.end());
-    processing_many_to_many_relations_.erase(id);
   }
-
   template<class ForeignType>
   void on_has_many_to_many(const char *id, object::collection<object::object_ptr<ForeignType>> &objects, const utils::foreign_attributes &attr) {
     if (!utils::is_cascade_type_set(attr.cascade(), utils::cascade_type::Insert)) {
       return;
     }
 
-    if (processing_many_to_many_relations_.find(id) != processing_many_to_many_relations_.end()) {
-      return;
-    }
-
     object::join_columns_collector collector;
     auto join_columns = collector.collect<ForeignType>();
 
@@ -214,18 +196,15 @@ public:
       throw query_builder_exception(query_build_error::InvalidRelationType);
     }
 
-    const auto cit = contexts_by_type_.find(it->second.node().info().type_index());
-    if (cit == contexts_by_type_.end()) {
-      throw query_builder_exception(query_build_error::UnknownType);
-    }
-
-    const auto rel_it = processing_many_to_many_relations_.insert(id);
-    std::vector<insert_step> rel_steps;
     for (auto &obj : objects) {
       if (!obj) {
         continue;
       }
 
+      if (obj.is_persistent()) {
+        continue;
+      }
+
       // Ensure target exists as dependency (deps first)
       if (obj.is_transient()) {
         build_for(obj, relation_steps_);
@@ -233,20 +212,23 @@ public:
 
       auto rel = object::make_object<relation_value_type>(join_columns.inverse_join_column, join_columns.join_column, obj, ptr_);
 
-      access::process(*this, *rel);
+      // Extract FK value from the foreign object
+      insert_step rel_step{};
+      // const auto pk = rel_step.pk_accessor.get(*obj);
+      // if (pk.is_valid()) {
+        // continue;
+      // }
 
-      insert_step step{};
-      step.pk_generator = utils::generator_type::None;
-      step.ctx = cit->second.insert;
-      step.bind_object = [rel](sql::statement &stmt) { stmt.bind(*rel); };
-      step.make_object_persistent = [] {};
-
-      rel_steps.push_back(std::move(step));
+      relation_steps_.push_back(std::move(rel_step));
     }
-    relation_steps_.insert(relation_steps_.end(), rel_steps.begin(), rel_steps.end());
-    processing_many_to_many_relations_.erase(id);
   }
 
+  template<class CollectionType>
+  void process_has_many_to_many(const char *id, CollectionType &objects, const char *join_column, const char *inverse_join_column) {
+    if (id == nullptr || join_column == nullptr || inverse_join_column == nullptr) {
+      return;
+    }
+  }
 private:
   template<class EntityType>
   static std::pair<std::type_index, const void *> make_visit_key(const object::object_ptr<EntityType> &ptr) {
@@ -310,7 +292,6 @@ private:
         step.pk_accessor.set(*ptr, id);
       };
     }
-    step.make_object_persistent = [ptr] { ptr.change_state(object::object_state::Persistent); };
     steps.push_back(std::move(step));
   }
 
@@ -337,7 +318,6 @@ private:
   std::vector<insert_step> steps_;
   std::vector<insert_step> relation_steps_;
   std::unordered_set<std::pair<std::type_index, const void *>, visit_key_hash> visited_;
-  std::unordered_set<std::string> processing_many_to_many_relations_;
 };
 }
 #endif //MATADOR_INSERT_QUERY_BUILDER_HPP

include/matador/query/key_value_generator.hpp

@@ -26,8 +26,6 @@ public:
     return result;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class V >
   void on_primary_key(const char *id, V &x, const utils::primary_key_attribute& /*attr*/) {
     result_.emplace_back(id, x);

include/matador/query/schema.hpp

@@ -60,8 +60,6 @@ public:
   , root_type_(root_type)
   {}
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   static void on_primary_key(const char * /*id*/, ValueType &/*value*/, const utils::primary_key_attribute& /*attr*/) {}
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}

include/matador/query/select_query_builder.hpp

@@ -89,9 +89,6 @@ public:
     }
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
-
   template < class V >
   void on_primary_key(const char *id, V &, const utils::primary_key_attribute& /*attr*/) {
     push(id);

include/matador/query/value_extractor.hpp

@@ -25,8 +25,6 @@ public:
     return values;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   void on_primary_key(const char *, ValueType &x, const utils::primary_key_attribute& attr) {
     utils::data_type_traits<ValueType>::bind_value(*this, 0, x, attr.size());

include/matador/sql/generator.hpp

@@ -44,8 +44,6 @@ public:
     return columns;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class V >
   void on_primary_key(const char *id, V &, const utils::primary_key_attribute& /*attr*/) {
       if (has_many_to_many_) {

include/matador/sql/internal/identifier_reader.hpp

@@ -22,8 +22,6 @@ public:
     return identifier_;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr) {
     utils::data_type_traits<ValueType>::read_value(reader_, id, column_index_, value, attr.size());

include/matador/sql/internal/object_result_binder.hpp

@@ -27,8 +27,6 @@ public:
     binder_ = nullptr;
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr);
   static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {}
@@ -75,8 +73,6 @@ public:
 
   void reset();
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class Type >
   void on_primary_key(const char *id, Type &val, const utils::primary_key_attribute& attr) {
     utils::data_type_traits<Type>::read_value(*binder_, id, index_++, val, attr.size());

include/matador/sql/internal/pk_reader.hpp

@@ -14,8 +14,6 @@ public:
     access::process(*this, obj);
   }
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr);
   void on_revision(const char * /*id*/, uint64_t &/*rev*/) {

include/matador/sql/internal/query_result_impl.hpp

@@ -40,8 +40,6 @@ public:
                     const std::type_index& result_type,
                     size_t column_index = 0);
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<typename ValueType>
   void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr) {
     utils::data_type_traits<ValueType>::read_value(*reader_, id, column_index_++, value, attr.size());

include/matador/sql/internal/query_result_pk_resolver.hpp

@@ -27,8 +27,6 @@ public:
         return pk_;
     }
 
-    template<typename BaseType>
-    static void on_base(const BaseType&) {}
     template<typename ValueType>
     void on_primary_key(const char *id, ValueType &/*value*/, const utils::primary_key_attribute& attr) {
         if (!type_stack_.empty()) {

include/matador/sql/object_parameter_binder.hpp

@@ -17,8 +17,6 @@ public:
   void reset(size_t start_index);
   [[nodiscard]] size_t current_index() const;
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template < class Type >
   void on_primary_key(const char * /*id*/, Type &val, const utils::primary_key_attribute& attr) {
     utils::data_type_traits<Type>::bind_value(*binder_, index_++, val, attr.size());

include/matador/sql/object_pk_binder.hpp

@@ -19,8 +19,6 @@ public:
         binder_ = nullptr;
     }
 
-    template<typename BaseType>
-    static void on_base(const BaseType&) {}
     template<typename ValueType>
     void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr);
     static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}

include/matador/utils/access.hpp

@@ -53,12 +53,12 @@ void revision(Operator &op, const char *id, uint64_t &value) {
 }
 
 template<class Operator, class Type>
-void attribute(Operator &op, const char *id, Type &value, const utils::field_attributes &attr = NullAttributes) {
+void attribute(Operator &op, const char *id, Type &value, const utils::field_attributes &attr = utils::NullAttributes) {
   op.on_attribute(id, value, attr);
 }
 
 template<class Operator, class Type>
-void attribute(Operator &op, const char *id, std::optional<Type> &value, const utils::field_attributes &attr = NullAttributes) {
+void attribute(Operator &op, const char *id, std::optional<Type> &value, const utils::field_attributes &attr = utils::NullAttributes) {
   op.on_attribute(id, value, attr);
 }
 

include/matador/utils/field_attributes.hpp

@@ -73,31 +73,8 @@ private:
   size_t size_ = 0;
   constraints options_ = constraints::None;
 };
-}
 
-namespace matador {
-const utils::field_attributes NullAttributes {};
-const utils::field_attributes VarChar63 {63};
-const utils::field_attributes VarChar127 {127};
-const utils::field_attributes VarChar255 {255};
-const utils::field_attributes VarChar511 {511};
-const utils::field_attributes VarChar1023 {1023};
-const utils::field_attributes VarChar2047 {2047};
-const utils::field_attributes VarChar4095 {4095};
-const utils::field_attributes UniqueVarChar63 {63, utils::constraints::Unique};
-const utils::field_attributes UniqueVarChar127 {127, utils::constraints::Unique};
-const utils::field_attributes UniqueVarChar255 {255, utils::constraints::Unique};
-const utils::field_attributes UniqueVarChar511 {511, utils::constraints::Unique};
-const utils::field_attributes UniqueVarChar1023 {1023, utils::constraints::Unique};
-const utils::field_attributes UniqueVarChar2047 {2047, utils::constraints::Unique};
-const utils::field_attributes UniqueVarChar4095 {4095, utils::constraints::Unique};
-const utils::field_attributes PrimaryKeyVarChar63 {63, utils::constraints::PrimaryKey};
-const utils::field_attributes PrimaryKeyVarChar127 {127, utils::constraints::PrimaryKey};
-const utils::field_attributes PrimaryKeyVarChar255 {255, utils::constraints::PrimaryKey};
-const utils::field_attributes PrimaryKeyVarChar511 {511, utils::constraints::PrimaryKey};
-const utils::field_attributes PrimaryKeyVarChar1023 {1023, utils::constraints::PrimaryKey};
-const utils::field_attributes PrimaryKeyVarChar2047 {2047, utils::constraints::PrimaryKey};
-const utils::field_attributes PrimaryKeyVarChar4095 {4095, utils::constraints::PrimaryKey};
-}
+const field_attributes NullAttributes {};
 
+}
 #endif //MATADOR_FIELD_ATTRIBUTES_HPP

include/matador/utils/primary_key_accessor.hpp

@@ -21,8 +21,6 @@ public:
     access::process(*this, obj);
   }
 
-  template<typename BaseType>
-  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>();
@@ -53,8 +51,6 @@ private:
 struct pk_unset_checker {
   bool unset{true};
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class PrimaryKeyType>
   void on_primary_key(const char * /*id*/, PrimaryKeyType &pk, const primary_key_attribute & = DefaultPkAttributes) {
     unset = !identifier_type_traits<PrimaryKeyType>::is_valid(pk);
@@ -77,8 +73,6 @@ struct pk_unset_checker {
 struct primary_key_getter {
   std::uint64_t value{0};
 
-  template<typename BaseType>
-  static void on_base(const BaseType&) {}
   template<class PrimaryKeyType>
   void on_primary_key(const char * /*id*/, PrimaryKeyType &pk, const primary_key_attribute & = DefaultPkAttributes) {
     pk_ = pk;

include/matador/utils/primary_key_attribute.hpp

@@ -48,14 +48,6 @@ private:
 };
 
 const primary_key_attribute DefaultPkAttributes {};
-const primary_key_attribute Identity {generator_type::Identity};
-const primary_key_attribute ManualVarChar63 {63};
-const primary_key_attribute ManualVarChar127 {127};
-const primary_key_attribute ManualVarChar255 {255};
-const primary_key_attribute ManualVarChar511 {511};
-const primary_key_attribute ManualVarChar1023 {1023};
-const primary_key_attribute ManualVarChar2047 {2047};
-const primary_key_attribute ManualVarChar4095 {4095};
 
 }
 #endif //PRIMARY_KEY_ATTRIBUTE_HPP

include/matador/utils/primary_key_generator_type.hpp

@@ -3,7 +3,6 @@
 
 namespace matador::utils {
 enum class generator_type {
-  None = 0,   /**< No generator type set. */
   Manual,     /**< User sets the primary key value manually. */
   Auto,       /**< Matador chooses the best generator type depending on the underlying dbms. */
   Identity,   /**< DBMS automatically generates the primary key value. */

source/orm/orm/session.cpp

@@ -56,6 +56,66 @@ session::session(session_context&& ctx, const query::schema &scm)
   }
 }
 
+utils::result<void, utils::error> session::drop_table(const std::string &table_name) const {
+  auto result = query::drop()
+      .table(table_name)
+      .execute(*this);
+  if (result.is_error()) {
+    return utils::failure(result.err());
+  }
+
+  return utils::ok<void>();
+}
+
+utils::result<sql::query_result<sql::record>, utils::error> session::fetch_all(const sql::query_context &q) const {
+  auto c = cache_.pool().acquire();
+  if (!c.valid()) {
+    return utils::failure(make_error(error_code::NoConnectionAvailable, "Failed to acquire connection."));
+  }
+  auto it = prototypes_.find(q.table_name);
+  if (it == prototypes_.end()) {
+    auto result = c->describe(q.table_name);
+    if (!result) {
+      return utils::failure(result.err());
+    }
+    it = prototypes_.emplace(q.table_name, *result).first;
+  }
+  // adjust columns from given query
+  for (auto &col: q.prototype) {
+    if (const auto rit = std::find_if(it->second.begin(), it->second.end(), [&col](const auto &value) {
+      return value.name() == col.name();
+    }); rit != it->second.end()) {
+      const_cast<object::attribute &>(col).change_type(rit->type());
+    }
+  }
+  auto res = fetch(q);
+  if (!res) {
+    return utils::failure(res.err());
+  }
+  const auto prototype = res.value()->prototype();
+  return utils::ok(sql::query_result<sql::record>{std::move(*res), prototype});
+}
+
+utils::result<sql::execute_result, utils::error> session::execute(const std::string &sql) const {
+  return execute(sql::query_context{sql});
+}
+
+std::vector<object::attribute> session::describe_table(const std::string &table_name) const {
+  const auto c = cache_.pool().acquire();
+  if (!c.valid()) {
+    throw std::logic_error("no database connection available");
+  }
+  return c->describe(table_name).release();
+}
+
+bool session::table_exists(const std::string &table_name) const {
+  const auto c = cache_.pool().acquire();
+  if (!c.valid()) {
+    throw std::logic_error("no database connection available");
+  }
+  return c->exists(dialect_.default_schema_name(), table_name);
+}
+
 const class sql::dialect &session::dialect() const {
   return dialect_;
 }

test/backends/QueryBasicTest.cpp

@@ -281,7 +281,7 @@ TEST_CASE_METHOD(QueryFixture, "Test describe table", "[query][describe][table]"
                                             "val_char", "val_float", "val_double", "val_short",
                                             "val_int", "val_long_long", "val_unsigned_char",
                                             "val_unsigned_short", "val_unsigned_int", "val_unsigned_long_long",
-                                            "val_bool", "val_string", "val_varchar",
+                                            "val_bool", /*"val_cstr", */"val_string", "val_varchar",
                                             // "val_date", "val_time",
                                             "val_binary"};
   const std::vector<std::function<bool (const attribute&)>> type_check = {
@@ -295,8 +295,11 @@ TEST_CASE_METHOD(QueryFixture, "Test describe table", "[query][describe][table]"
     [](const attribute &cf) { return cf.is_integer(); },
     [](const attribute &cf) { return cf.is_integer(); },
     [](const attribute &cf) { return cf.is_integer(); },
+    // [](const attribute_definition &cf) { return cf.is_integer(); },
+    // [](const attribute_definition &cf) { return cf.is_integer(); },
     [](const attribute &cf) { return cf.is_integer(); },
     [](const attribute &cf) { return cf.is_bool(); },
+    // [](const attribute_definition &cf) { return cf.is_varchar(); },
     [](const attribute &cf) { return cf.is_string(); },
     [](const attribute &cf) { return cf.is_varchar(); },
     // [](const attribute_definition &cf) { return cf.is_date(); },
@@ -326,7 +329,7 @@ struct pk {
   template<class Operator>
   void process(Operator &op) {
     access::primary_key(op, "id", id);
-    access::attribute(op, "name", name, VarChar255);
+    access::attribute(op, "name", name, 255);
   }
 
   uint32_t id{};

test/backends/SessionInsertHasMany.cpp

@@ -11,47 +11,6 @@ using namespace matador;
 using namespace matador::object;
 using namespace matador::test;
 
-namespace matador::test {
-struct book_identity;
-struct author_identity {
-  unsigned int id{};
-  std::string name;
-  collection<object_ptr<book_identity> > books;
-
-  author_identity() = default;
-  explicit author_identity(std::string name)
-  : name(std::move(name)) {}
-
-  template<typename Operator>
-  void process(Operator &op) {
-    namespace field = matador::access;
-    field::primary_key(op, "id", id, utils::Identity);
-    field::attribute(op, "first_name", name, VarChar63);
-    field::has_many(op, "books", books, "author_id", utils::CascadeAllFetchLazy);
-  }
-};
-
-struct book_identity {
-  unsigned int id{};
-  std::string title;
-  object_ptr<author_identity> book_author;
-  unsigned short published_in{};
-
-  book_identity() = default;
-  book_identity(std::string title, object_ptr<author_identity> author, const unsigned short published_in)
-  : title(std::move(title)), book_author(std::move(author)), published_in(published_in) {}
-
-  template<typename Operator>
-  void process(Operator &op) {
-    namespace field = matador::access;
-    field::primary_key(op, "id", id, utils::Identity);
-    field::attribute(op, "title", title, VarChar511);
-    field::belongs_to(op, "author_id", book_author, utils::CascadeAllFetchEager);
-    field::attribute(op, "published_in", published_in);
-  }
-};
-}
-
 TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation", "[session][insert][has_many]") {
   const auto result = schema.attach<book>("books")
     .and_then( [this] { return schema.attach<author>("authors"); } )
@@ -63,32 +22,11 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation", "[
 
   auto s_king = make_object<author>(1, "Steven", "King", "21.9.1947", 1956, false);
 
-  s_king->books.push_back(make_object<book>(2, "Carrie", nullobj, 1974));
-  s_king->books.push_back(make_object<book>(3, "The Shining", nullobj, 1977));
-  s_king->books.push_back(make_object<book>(4, "It", nullobj, 1986));
-  s_king->books.push_back(make_object<book>(5, "Misery", nullobj, 1987));
-  s_king->books.push_back(make_object<book>(6, "The Dark Tower: The Gunslinger", nullobj, 1982));
-
-  auto res = ses.insert(s_king);
-  REQUIRE(res.is_ok());
-}
-
-TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation with identity", "[session][insert][has_many][identity]") {
-  const auto result = schema.attach<book_identity>("books")
-    .and_then( [this] { return schema.attach<author_identity>("authors"); } )
-    .and_then([this] { return schema.create(db); } );
-  REQUIRE(result.is_ok());
-
-  orm::session ses({bus, connection::dns, 4}, schema);
-  schema.initialize(ses);
-
-  auto s_king = make_object<author_identity>("Steven King");
-
-  s_king->books.push_back(make_object<book_identity>("Carrie", nullobj, 1974));
-  s_king->books.push_back(make_object<book_identity>("The Shining", nullobj, 1977));
-  s_king->books.push_back(make_object<book_identity>("It", nullobj, 1986));
-  s_king->books.push_back(make_object<book_identity>("Misery", nullobj, 1987));
-  s_king->books.push_back(make_object<book_identity>("The Dark Tower: The Gunslinger", nullobj, 1982));
+  s_king->books.push_back(make_object<book>(2, "Carrie", object_ptr<author>{}, 1974));
+  s_king->books.push_back(make_object<book>(3, "The Shining", object_ptr<author>{}, 1977));
+  s_king->books.push_back(make_object<book>(4, "It", object_ptr<author>{}, 1986));
+  s_king->books.push_back(make_object<book>(5, "Misery", object_ptr<author>{}, 1987));
+  s_king->books.push_back(make_object<book>(6, "The Dark Tower: The Gunslinger", object_ptr<author>{}, 1982));
 
   auto res = ses.insert(s_king);
   REQUIRE(res.is_ok());

test/backends/SessionInsertHasManyToManyTest.cpp

@@ -5,12 +5,10 @@
 #include "connection.hpp"
 
 #include "models/recipe.hpp"
-#include "models/model_metas.hpp"
 
 using namespace matador;
 using namespace matador::object;
 using namespace matador::test;
-using namespace matador::query::meta;
 
 TEST_CASE_METHOD(SessionFixture, "Test insert object with has many to many relation", "[session][insert][has_many_to_many]") {
   auto result = schema.attach<recipe>("recipes")
@@ -18,7 +16,6 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many to many relat
     .and_then([this] { return schema.create(db); } );
 
   orm::session ses({bus, connection::dns, 4}, schema);
-  schema.initialize(ses);
 
   std::vector ingredients {
     make_object<ingredient>(1, "Apple"),
@@ -40,16 +37,4 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many to many relat
     auto res = ses.insert(r);
     REQUIRE(res.is_ok());
   }
-
-  auto recipe_result = ses.find<recipe>(1);
-  // auto recipe_result = ses.find<recipe>(RECIPE.id == 1);
-  REQUIRE(recipe_result.is_ok());
-
-  // auto r = *recipe_result->begin();
-  auto r = *recipe_result;
-  std::cout << r->name << " (ingredients: " << r->ingredients.size() << ")" << std::endl;
-  // REQUIRE(r->name != "");
-  for (const auto &ingr: r->ingredients) {
-    std::cout << "  " << ingr->name << std::endl;
-  }
 }

test/models/airplane.hpp

@@ -24,8 +24,8 @@ struct airplane {
     namespace field = matador::access;
     using namespace matador::utils;
     field::primary_key(op, "id", id);
-    field::attribute(op, "brand", brand, UniqueVarChar255);
-    field::attribute(op, "model", model, UniqueVarChar255);
+    field::attribute(op, "brand", brand, 255);
+    field::attribute(op, "model", model, 255);
   }
 };
 }
@@ -36,8 +36,8 @@ struct airplane {
 //     namespace field = matador::access;
 //     using namespace matador::utils;
 //     field::primary_key(op, "id", object.id);
-//     field::attribute(op, "brand", object.brand, UniqueVarChar255);
-//     field::attribute(op, "model", object.model, UniqueVarChar255);
+//     field::attribute(op, "brand", object.brand, 255);
+//     field::attribute(op, "model", object.model, 255);
 // }
 // template<class Operator>
 // void process(Operator &op, const matador::test::airplane &object) {

test/models/author.hpp

@@ -2,7 +2,6 @@
 #define QUERY_AUTHOR_HPP
 
 #include "matador/utils/access.hpp"
-#include "matador/utils/field_attributes.hpp"
 
 #include "matador/object/object_ptr.hpp"
 #include "matador/object/collection.hpp"
@@ -33,9 +32,9 @@ struct author {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "first_name", first_name, VarChar63);
-    field::attribute(op, "last_name", last_name, VarChar63);
-    field::attribute(op, "date_of_birth", date_of_birth, VarChar63);
+    field::attribute(op, "first_name", first_name, 63);
+    field::attribute(op, "last_name", last_name, 63);
+    field::attribute(op, "date_of_birth", date_of_birth, 31);
     field::attribute(op, "year_of_birth", year_of_birth);
     field::attribute(op, "distinguished", distinguished);
     field::has_many(op, "books", books, "author_id", utils::CascadeAllFetchLazy);

test/models/book.hpp

@@ -4,7 +4,6 @@
 #include "matador/object/object_ptr.hpp"
 
 #include "matador/utils/access.hpp"
-#include "matador/utils/field_attributes.hpp"
 #include "matador/utils/foreign_attributes.hpp"
 
 #include <string>
@@ -14,7 +13,7 @@ struct author;
 
 struct book {
   book() = default;
-  book(const unsigned int id, std::string title, object::object_ptr<author> author, const unsigned short published_in)
+  book(const unsigned int id, std::string title, object::object_ptr<author> author, unsigned short published_in)
   : id(id), title(std::move(title)), book_author(std::move(author)), published_in(published_in) {}
   unsigned int id{};
   std::string title;
@@ -25,7 +24,7 @@ struct book {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "title", title, VarChar511);
+    field::attribute(op, "title", title, 511);
     field::belongs_to(op, "author_id", book_author, utils::CascadeAllFetchEager);
     field::attribute(op, "published_in", published_in);
   }

test/models/category.hpp

@@ -2,7 +2,6 @@
 #define QUERY_CATEGORY_HPP
 
 #include "matador/utils/access.hpp"
-#include "matador/utils/field_attributes.hpp"
 
 #include <string>
 
@@ -16,7 +15,7 @@ struct category {
     namespace field = matador::access;
     using namespace matador::utils;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar255);
+    field::attribute(op, "name", name, 255);
   }
 };
 }

test/models/coordinate.hpp

@@ -14,7 +14,7 @@ struct coordinate {
 
 namespace matador::access {
 template<class Operator>
-void attribute(Operator &op, const char *id, test::coordinate &value, const utils::field_attributes &attr = NullAttributes) {
+void attribute(Operator &op, const char *id, test::coordinate &value, const utils::field_attributes &attr = utils::NullAttributes) {
   attribute(op, (std::string(id) + "_x").c_str(), value.x, attr);
   attribute(op, (std::string(id) + "_y").c_str(), value.y, attr);
   attribute(op, (std::string(id) + "_z").c_str(), value.z, attr);

test/models/department.hpp

@@ -24,7 +24,7 @@ struct department {
     void process(Operator &op) {
         namespace field = matador::access;
         field::primary_key(op, "id", id);
-        field::attribute(op, "name", name, UniqueVarChar63);
+        field::attribute(op, "name", name, 63);
         field::has_many(op, "employees", employees, "dep_id", utils::CascadeAllFetchEager);
         // field::belongs_to(op, "manager_id", manager, utils::fetch_type::EAGER);
     }
@@ -43,8 +43,8 @@ struct employee {
     void process(Operator &op) {
         namespace field = matador::access;
         field::primary_key(op, "id", id);
-        field::attribute(op, "first_name", first_name, VarChar63);
-        field::attribute(op, "last_name", last_name, VarChar63);
+        field::attribute(op, "first_name", first_name, 63);
+        field::attribute(op, "last_name", last_name, 63);
         field::belongs_to(op, "dep_id", dep, utils::CascadeAllFetchLazy);
     }
 };

test/models/flight.hpp

@@ -30,7 +30,7 @@ struct flight {
     using namespace matador::utils;
     field::primary_key(op, "id", id);
     field::belongs_to(op, "airplane_id", plane, {utils::cascade_type::All, fetch_type::Eager});
-    field::attribute(op, "pilot_name", pilot_name, VarChar255);
+    field::attribute(op, "pilot_name", pilot_name, 255);
   }
 };
 }

test/models/location.hpp

@@ -22,7 +22,7 @@ struct location {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar63);
+    field::attribute(op, "name", name, 255);
     field::attribute(op, "coordinate", coord);
     field::attribute(op, "color", color);
   }

test/models/optional.hpp

@@ -18,7 +18,7 @@ struct optional {
     namespace field = matador::access;
     using namespace matador::utils;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, VarChar255);
+    field::attribute(op, "name", name, 255);
     field::attribute(op, "age", age);
   }
 };

test/models/order.hpp

@@ -28,17 +28,17 @@ struct order {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "order_id", order_id);
-    field::attribute(op, "order_date", order_date, VarChar255);
-    field::attribute(op, "required_date", required_date, VarChar255);
-    field::attribute(op, "shipped_date", shipped_date, VarChar255);
+    field::attribute(op, "order_date", order_date, 255);
+    field::attribute(op, "required_date", required_date, 255);
+    field::attribute(op, "shipped_date", shipped_date, 255);
     field::attribute(op, "ship_via", ship_via);
     field::attribute(op, "freight", freight);
-    field::attribute(op, "ship_name", ship_name, VarChar255);
-    field::attribute(op, "ship_address", ship_address, VarChar255);
-    field::attribute(op, "ship_city", ship_city, VarChar255);
-    field::attribute(op, "ship_region", ship_region, VarChar255);
-    field::attribute(op, "ship_postal_code", ship_postal_code, VarChar255);
-    field::attribute(op, "ship_country", ship_country, VarChar255);
+    field::attribute(op, "ship_name", ship_name, 255);
+    field::attribute(op, "ship_address", ship_address, 255);
+    field::attribute(op, "ship_city", ship_city, 255);
+    field::attribute(op, "ship_region", ship_region, 255);
+    field::attribute(op, "ship_postal_code", ship_postal_code, 255);
+    field::attribute(op, "ship_country", ship_country, 255);
     field::has_many(op, "order_details", order_details_, "order_id", utils::fetch_type::Eager);
   }
 };

test/models/person.hpp

@@ -19,7 +19,7 @@ struct person {
     namespace field = matador::access;
     using namespace matador::utils;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar255);
+    field::attribute(op, "name", name, 255);
     field::attribute(op, "age", age);
     field::attribute(op, "image", image);
   }

test/models/product.hpp

@@ -26,10 +26,10 @@ struct product {
   void process(Operator &op) {
     namespace field = matador::access;
     using namespace matador::utils;
-    field::primary_key(op, "product_name", product_name, ManualVarChar511);
+    field::primary_key(op, "product_name", product_name, 255);
     field::belongs_to(op, "supplier_id", seller, CascadeAllFetchLazy);
     field::belongs_to(op, "category_id", type, CascadeAllFetchLazy);
-    field::attribute(op, "quantity_per_unit", quantity_per_unit, VarChar255);
+    field::attribute(op, "quantity_per_unit", quantity_per_unit, 255);
     field::attribute(op, "unit_price", unit_price);
     field::attribute(op, "units_in_stock", units_in_stock);
     field::attribute(op, "units_in_order", units_in_order);

test/models/recipe.hpp

@@ -29,7 +29,7 @@ struct ingredient {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar255);
+    field::attribute(op, "name", name, 255);
     field::has_many_to_many(op, "recipe_ingredients", recipes, "ingredient_id", "recipe_id", utils::CascadeAllFetchEager);
   }
 };
@@ -53,10 +53,15 @@ struct recipe {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar255);
+    field::attribute(op, "name", name, 255);
     field::has_many_to_many(op, "recipe_ingredients", ingredients, utils::CascadeAllFetchLazy);
   }
 };
+
+// class recipe_ingredient : public object::many_to_many_relation<recipe, ingredient> {
+// public:
+// recipe_ingredient() : many_to_many_relation("recipe_id", "ingredient_id") {}
+// };
 }
 
 #endif //QUERY_RECIPE_HPP

test/models/shipment.hpp

@@ -25,7 +25,7 @@ struct shipment {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "tracking_number", tracking_number, UniqueVarChar255);
+    field::attribute(op, "tracking_number", tracking_number, 255);
     field::has_many(op, "packages", packages, "shipment_id", utils::CascadeAllFetchEager);
   }
 };

test/models/student.hpp

@@ -2,11 +2,11 @@
 #define QUERY_STUDENT_HPP
 
 #include "matador/utils/access.hpp"
-#include "matador/utils/field_attributes.hpp"
 #include "matador/utils/foreign_attributes.hpp"
 
 #include "matador/object/object_ptr.hpp"
 #include "matador/object/collection.hpp"
+#include "matador/object/many_to_many_relation.hpp"
 
 #include <utility>
 #include <vector>
@@ -30,7 +30,7 @@ struct student {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar255);
+    field::attribute(op, "name", name, 255);
     field::has_many_to_many(op, "student_courses", courses, "student_id", "course_id", utils::CascadeAllFetchLazy);
   }
 };
@@ -51,9 +51,15 @@ struct course {
   void process(Operator &op) {
     namespace field = matador::access;
     field::primary_key(op, "id", id);
-    field::attribute(op, "title", title, UniqueVarChar255);
+    field::attribute(op, "title", title, 255);
     field::has_many_to_many(op, "student_courses", students, utils::CascadeAllFetchEager);
   }
 };
+
+class student_course : public object::many_to_many_relation<student, course> {
+public:
+  student_course() : many_to_many_relation("student_id", "course_id") {
+  }
+};
 }
 #endif //QUERY_STUDENT_HPP

test/models/supplier.hpp

@@ -15,7 +15,7 @@ struct supplier {
     namespace field = matador::access;
     using namespace matador::utils;
     field::primary_key(op, "id", id);
-    field::attribute(op, "name", name, UniqueVarChar255);
+    field::attribute(op, "name", name, 255);
   }
 };
 }

test/models/types.hpp

@@ -6,6 +6,8 @@
 
 namespace matador::test {
 struct types {
+  // enum { CSTR_LEN=255 };
+
   unsigned int id_ = 0;
   int8_t char_ = 'c';
   short short_ = -127;
@@ -18,6 +20,7 @@ struct types {
   float float_ = 3.1415f;
   double double_ = 1.1414;
   bool bool_ = true;
+  // char cstr_[CSTR_LEN]{};
   std::string string_ = "Welt";
   std::string varchar_ = "Erde";
   //    matador::date date_;
@@ -40,8 +43,9 @@ struct types {
     field::attribute(op, "val_unsigned_int", unsigned_int_);
     field::attribute(op, "val_unsigned_long_long", unsigned_long64_);
     field::attribute(op, "val_bool", bool_);
+    // field::attribute(op, "val_cstr", cstr_, CSTR_LEN);
     field::attribute(op, "val_string", string_);
-    field::attribute(op, "val_varchar", varchar_, VarChar63);
+    field::attribute(op, "val_varchar", varchar_, 63);
     // field::attribute(op, "val_date", date_);
     // field::attribute(op, "val_time", time_);
     field::attribute(op, "val_binary", binary_);

test/orm/query/InsertQueryBuilderTest.cpp

@@ -18,7 +18,6 @@
 #include "../../models/book.hpp"
 #include "../../models/airplane.hpp"
 #include "../../models/flight.hpp"
-#include "../../models/recipe.hpp"
 
 using namespace matador::object;
 using namespace matador::sql;
@@ -114,40 +113,3 @@ TEST_CASE("Test insert builder has many", "[query][insert_query_builder][has_man
   REQUIRE_FALSE(stmts.empty());
   REQUIRE(stmts.size() == 6);
 }
-
-TEST_CASE("Test insert builder has many to many", "[query][insert_query_builder][many_to_many]") {
-  using namespace matador::test;
-  backend_provider::instance().register_backend("noop", std::make_unique<orm::test_backend_service>());
-  connection db("noop://noop.db");
-
-  schema scm;
-  const auto result = scm.attach<recipe>("recipes")
-    .and_then( [&scm] { return scm.attach<ingredient>("ingredients"); } );
-  REQUIRE(result.is_ok());
-
-  const std::vector ingredients {
-    make_object<ingredient>(1, "Apple"),
-    make_object<ingredient>(2, "Strawberry"),
-    make_object<ingredient>(3, "Pineapple"),
-    make_object<ingredient>(4, "Sugar"),
-    make_object<ingredient>(5, "Flour"),
-    make_object<ingredient>(6, "Butter"),
-    make_object<ingredient>(7, "Beans")
-  };
-
-  std::vector recipes {
-    make_object<recipe>(1, "Apple Pie", std::vector{ingredients[0], ingredients[3], ingredients[4]}),
-    make_object<recipe>(2, "Strawberry Cake", std::vector{ingredients[5], ingredients[6]}),
-    make_object<recipe>(3, "Pineapple Pie", std::vector{ingredients[0], ingredients[1], ingredients[2]})
-  };
-
-  const auto contexts_by_type = to_contexts_by_name(scm, db.dialect());
-  insert_query_builder<recipe> iqb(scm, contexts_by_type);
-
-  auto build_result = iqb.build(recipes[0]);
-  REQUIRE(build_result.is_ok());
-
-  const auto& stmts = *build_result;
-  REQUIRE_FALSE(stmts.empty());
-  REQUIRE(stmts.size() == 7);
-}