Merge remote-tracking branch 'origin/feature/matador-ng' into feature/matador-ng

# Conflicts:
#	source/orm/query/query_compiler.cpp

include/matador/query/intermediates/query_alter_table_intermediate.hpp

@@ -2,10 +2,11 @@
 #define MATADOR_QUERY_ALTER_TABLE_INTERMEDIATE_HPP
 
 #include "executable_query.hpp"
+#include "matador/object/constraint.hpp"
 #include "matador/query/intermediates/query_intermediate.hpp"
 
 namespace matador::query {
-class query_add_primary_key_constraint_intermediate final : public query_intermediate {
+class query_add_primary_key_constraint_intermediate final : public executable_query {
 public:
 };
 
@@ -35,6 +36,7 @@ public:
     using query_intermediate::query_intermediate;
 
     query_add_key_constraint_intermediate add_constraint(const std::string& name);
+    executable_query add_constraint(const class object::constraint& constraint);
     executable_query drop_constraint(const std::string& name);
 };
 }