removed object_definition class

2025-11-21 09:16:53 +01:00
parent d8903ed772
commit dae3c1645b
12 changed files with 2 additions and 299 deletions
@@ -20,7 +20,6 @@ add_library(matador-core STATIC
  ../../include/matador/object/foreign_node_completer.hpp
  ../../include/matador/object/internal/shadow_repository.hpp
  ../../include/matador/object/many_to_many_relation.hpp
-  ../../include/matador/object/object_definition.hpp
  ../../include/matador/object/object_info.hpp
  ../../include/matador/object/object_proxy.hpp
  ../../include/matador/object/object_ptr.hpp
@@ -81,7 +80,6 @@ add_library(matador-core STATIC
  object/error_code.cpp
  object/foreign_node_completer.cpp
  object/internal/shadow_repository.cpp
-  object/object_definition.cpp
  object/relation_endpoint.cpp
  object/repository.cpp
  object/repository_node.cpp
@@ -1,7 +1,5 @@
 #include "matador/object/attribute_definition.hpp"

-#include "matador/object/object_definition.hpp"
-
 #include <ostream>
 #include <utility>

@@ -59,14 +57,6 @@ std::string attribute_definition::full_name() const {
  return !table_name_.empty() ? table_name_ + "." + name_ : name_;
 }

-// std::shared_ptr<object_definition> attribute_definition::object() const {
-//   return object_;
-// }
-//
-// void attribute_definition::object(const std::shared_ptr<object_definition>& obj) {
-//   object_ = obj;
-// }
-//
 int attribute_definition::index() const {
  return options_.index;
 }
@@ -5,16 +5,6 @@
 #include <algorithm>

 namespace matador::object {
-// basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
-//                                      utils::identifier &&pk,
-//                                      const std::shared_ptr<attribute_definition> &pk_column,
-//                                      const std::shared_ptr<object_definition> &definition)
-// : node_(std::move(node))
-// , definition_(definition)
-// , identifier_(std::move(pk))
-// , pk_column_(pk_column) {
-// }
-
 basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
                                     const std::vector<attribute_definition> &attributes,
                                     utils::identifier &&pk,
@@ -1,153 +0,0 @@
-#include "matador/object/object_definition.hpp"
-
-namespace matador::object {
-object_definition::object_definition(std::string name)
-: name_(std::move(name)) {}
-
-object_definition::object_definition(std::string name, const std::initializer_list<attribute_definition> columns)
-: name_(std::move(name))
-, columns_(columns) {
-  init();
-}
-
-object_definition::object_definition(std::string name, const std::vector<attribute_definition> &columns)
-: name_(std::move(name))
-, columns_(columns) {
-  init();
-}
-
-object_definition::object_definition(const object_definition &x)
-: name_(x.name_)
-, columns_(x.columns_)
-, pk_index_(x.pk_index_) {
-  for (auto& col : columns_) {
-    add_to_map(col, col.index());
-  }
-}
-
-object_definition &object_definition::operator=(const object_definition &x)
-{
-  if (&x == this) {
-    return *this;
-  }
-
-  name_ = x.name_;
-  columns_ = x.columns_;
-  columns_by_name_.clear();
-  pk_index_ = x.pk_index_;
-  for (auto& col : columns_) {
-    add_to_map(col, col.index());
-  }
-  return *this;
-}
-
-const std::string& object_definition::name() const {
-  return name_;
-}
-
-bool object_definition::has_primary_key() const {
-    return pk_index_ > -1;
-}
-
-std::optional<attribute_definition> object_definition::primary_key() const
-{
-  if (!has_primary_key()) {
-    return std::nullopt;
-  }
-
-  return columns_[pk_index_];
-}
-
-void object_definition::append(attribute_definition&& col) {
-  auto &ref = columns_.emplace_back(std::move(col));
-  add_to_map(ref, columns_.size()-1);
-}
-
-const std::vector<object::attribute_definition> &object_definition::columns() const {
-  return columns_;
-}
-
-const attribute_definition &object_definition::at(const std::string &name) const
-{
-  return columns_by_name_.at(name).first;
-}
-
-const attribute_definition &object_definition::at( const size_t index) const
-{
-  return columns_.at(index);
-}
-
-object_definition::iterator object_definition::find(const std::string &column_name)
-{
-  const auto it = columns_by_name_.find(column_name);
-  return it != columns_by_name_.end() ? columns_.begin() + it->second.second : columns_.end();
-}
-
-object_definition::const_iterator object_definition::find(const std::string &column_name) const {
-  const auto it = columns_by_name_.find(column_name);
-  return it != columns_by_name_.end() ? columns_.begin() + it->second.second : columns_.end();
-}
-
-object_definition::iterator object_definition::begin()
-{
-  return columns_.begin();
-}
-
-object_definition::const_iterator object_definition::begin() const
-{
-  return columns_.begin();
-}
-
-object_definition::const_iterator object_definition::cbegin() const
-{
-  return columns_.cbegin();
-}
-
-object_definition::iterator object_definition::end()
-{
-  return columns_.end();
-}
-
-object_definition::const_iterator object_definition::end() const
-{
-  return columns_.end();
-}
-
-object_definition::const_iterator object_definition::cend() const
-{
-  return columns_.cend();
-}
-
-size_t object_definition::size() const
-{
-  return columns_.size();
-}
-
-bool object_definition::empty() const
-{
-  return columns_.empty();
-}
-
-void object_definition::clear()
-{
-  columns_.clear();
-  columns_by_name_.clear();
-}
-
-void object_definition::init()
-{
-  size_t index{0};
-  for(auto &col : columns_) {
-    add_to_map(col, index++);
-  }
-}
-
-void object_definition::add_to_map(attribute_definition &col, size_t index)
-{
-  columns_by_name_.emplace(col.name(), column_index_pair {std::ref(col), index});
-  if (is_constraint_set(col.attributes().options(), utils::constraints::PRIMARY_KEY)) {
-    pk_index_ = static_cast<int>(index);
-  }
-}
-
-}
@@ -1,7 +1,5 @@
 #include "matador/query/query_compiler.hpp"

-#include "matador/object/object_definition.hpp"
-
 #include "matador/query/attribute_string_writer.hpp"
 #include "matador/query/query_data.hpp"
 #include "matador/query/criteria_evaluator.hpp"