sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

removed obsolete namespace

This commit is contained in:
Sascha Kühl 2025-02-07 11:48:40 +01:00
parent a593539ae4
commit 8b41fbc531
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/matador/object/object_definition.hpp
View File

@ -9,8 +9,8 @@ namespace matador::object {
class object_definition final {
private:
using column_by_index = std::vector<object::attribute_definition>;
using column_index_pair = std::pair<std::reference_wrapper<object::attribute_definition>, column_by_index::difference_type>;
using column_by_index = std::vector<attribute_definition>;
using column_index_pair = std::pair<std::reference_wrapper<attribute_definition>, column_by_index::difference_type>;
using column_by_name_map = std::unordered_map<std::string, column_index_pair>;
public:
@ -18,8 +18,8 @@ public:
using const_iterator = column_by_index::const_iterator;
object_definition() = default;
object_definition(std::initializer_list<object::attribute_definition> columns);
explicit object_definition(const std::vector<object::attribute_definition> &columns);
object_definition(std::initializer_list<attribute_definition> columns);
explicit object_definition(const std::vector<attribute_definition> &columns);
object_definition(const object_definition &x);
object_definition& operator=(const object_definition &x);
object_definition(object_definition&&) noexcept = default;
@ -27,7 +27,7 @@ public:
~object_definition() = default;
[[nodiscard]] bool has_primary_key() const;
[[nodiscard]] std::optional<object::attribute_definition> primary_key() const;
[[nodiscard]] std::optional<attribute_definition> primary_key() const;
template < typename Type >
void append(const std::string &name, long size = -1) {
@ -35,7 +35,7 @@ public:
}
void append(attribute_definition col);
[[nodiscard]] const std::vector<object::attribute_definition>& columns() const;
[[nodiscard]] const std::vector<attribute_definition>& columns() const;
[[nodiscard]] const attribute_definition& at(const std::string &name) const;
[[nodiscard]] const attribute_definition& at(size_t index) const;

6
source/core/object/object_definition.cpp
View File

@ -1,13 +1,13 @@
#include "matador/object/object_definition.hpp"
namespace matador::object {
object_definition::object_definition(std::initializer_list<object::attribute_definition> columns)
object_definition::object_definition(const std::initializer_list<attribute_definition> columns)
: columns_(columns)
{
init();
}
object_definition::object_definition(const std::vector<object::attribute_definition> &columns)
object_definition::object_definition(const std::vector<attribute_definition> &columns)
: columns_(columns)
{
init();
@ -42,7 +42,7 @@ bool object_definition::has_primary_key() const
return pk_index_ > -1;
}
std::optional<object::attribute_definition> object_definition::primary_key() const
std::optional<attribute_definition> object_definition::primary_key() const
{
if (!has_primary_key()) {
return std::nullopt;