renamed class attribute_definition to attribute

include/matador/query/builder.hpp

@@ -1,12 +1,11 @@
 #ifndef MATADOR_BUILDER_HPP
 #define MATADOR_BUILDER_HPP
 
-#include "matador/object/attribute_definition.hpp"
-
 #include "matador/query/column.hpp"
 #include "matador/query/table.hpp"
 
 #include "matador/utils/basic_types.hpp"
+#include "matador/utils/constraints.hpp"
 
 #include <string>
 
@@ -24,26 +23,26 @@ private:
     std::string alias_;
 };
 
-class attribute {
-public:
-    attribute(std::string name, const utils::basic_type type)
-    : name_(std::move(name))
-    , type_(type) {}
-
-    [[nodiscard]] const std::string& name() const;
-    [[nodiscard]] utils::basic_type type() const;
-    [[nodiscard]] const attribute_options& options() const;
-
-private:
-    friend class entity;
-
-    std::string name_;
-    std::string alias_;
-    utils::basic_type type_{};
-    attribute_options options_;
-
-    entity* owner_{nullptr};
-};
+// class attribute {
+// public:
+//     attribute(std::string name, const utils::basic_type type)
+//     : name_(std::move(name))
+//     , type_(type) {}
+//
+//     [[nodiscard]] const std::string& name() const;
+//     [[nodiscard]] utils::basic_type type() const;
+//     [[nodiscard]] const attribute_options& options() const;
+//
+// private:
+//     friend class entity;
+//
+//     std::string name_;
+//     std::string alias_;
+//     utils::basic_type type_{};
+//     attribute_options options_;
+//
+//     entity* owner_{nullptr};
+// };
 
 class constraint {
 public:

include/matador/query/intermediates/query_create_intermediate.hpp

@@ -13,8 +13,8 @@ class query_create_intermediate : public query_intermediate {
 public:
   query_create_intermediate();
 
-  executable_query table(const table &tab, std::initializer_list<object::attribute_definition> columns);
-  executable_query table(const query::table &tab, const std::vector<object::attribute_definition> &columns);
+  executable_query table(const table &tab, std::initializer_list<object::attribute> columns);
+  executable_query table(const query::table &tab, const std::vector<object::attribute> &columns);
   template<class Type>
   executable_query table(const matador::query::table &tab, const object::repository &schema) {
     return this->table(tab, object::attribute_definition_generator::generate<Type>(schema));

include/matador/query/internal/query_parts.hpp

@@ -9,7 +9,7 @@
 #include "matador/query/column.hpp"
 #include "matador/query/table.hpp"
 
-#include "matador/object/attribute_definition.hpp"
+#include "matador/object/attribute.hpp"
 
 #include "matador/utils/placeholder.hpp"
 
@@ -364,17 +364,17 @@ private:
 class query_create_table_part final : public query_part
 {
 public:
-  query_create_table_part(table table, std::vector<object::attribute_definition> columns);
+  query_create_table_part(table table, std::vector<object::attribute> columns);
 
   [[nodiscard]] const table& table() const;
-  [[nodiscard]] const std::vector<object::attribute_definition>& columns() const;
+  [[nodiscard]] const std::vector<object::attribute>& columns() const;
 
 private:
   void accept(query_part_visitor &visitor) override;
 
 private:
   class table table_;
-  std::vector<object::attribute_definition> columns_;
+  std::vector<object::attribute> columns_;
 };
 
 class query_create_schema_part final : public query_part {

include/matador/query/query_data.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "matador/object/attribute_definition.hpp"
+#include "matador/object/attribute.hpp"
 
 #include "matador/query/table.hpp"
 #include "matador/query/query_part.hpp"
@@ -13,7 +13,7 @@ namespace matador::query {
 
 struct query_data {
   std::vector<std::unique_ptr<query_part>> parts{};
-  std::vector<object::attribute_definition> columns{};
+  std::vector<object::attribute> columns{};
   std::unordered_map<std::string, table> tables{};
 };