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

object changes

Browse Source
This commit is contained in:
Sascha Kühl
2025-12-09 14:47:08 +01:00
parent d4a8801cd2
commit 4fcbe9c064
19 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/object/basic_object_info.hpp
+4 -4
View File
@@ -26,7 +26,7 @@ public:
[[nodiscard]] std::type_index type_index() const;
[[nodiscard]] std::string name() const;
[[nodiscard]] const class object& object() const;
[[nodiscard]] std::shared_ptr<class object> object() const;
[[nodiscard]] const std::list<attribute>& attributes() const;
[[nodiscard]] const std::list<class constraint>& constraints() const;
@@ -34,7 +34,7 @@ public:
[[nodiscard]] const utils::identifier& primary_key() const;
[[nodiscard]] attribute* primary_key_attribute() const;
void update_name(const std::string& name);
void update_name(const std::string& name) const;
endpoint_iterator register_relation_endpoint(const std::type_index &type, const std::shared_ptr<relation_endpoint> &endpoint);
void unregister_relation_endpoint(const std::type_index &type);
@@ -55,10 +55,10 @@ public:
[[nodiscard]] bool endpoints_empty() const;
protected:
basic_object_info(std::shared_ptr<repository_node> node, std::unique_ptr<class object> &&obj);
basic_object_info(std::shared_ptr<repository_node> node, std::shared_ptr<class object> &&obj);
protected:
std::unique_ptr<class object> object_;
std::shared_ptr<class object> object_;
std::shared_ptr<repository_node> node_; /**< prototype node of the represented object type */
t_endpoint_map relation_endpoints_;
};
include/matador/object/constraint.hpp
+3 -3
View File
@@ -23,7 +23,7 @@ public:
[[nodiscard]] const std::string& name() const;
[[nodiscard]] const class attribute* attribute() const;
[[nodiscard]] std::string column_name() const;
[[nodiscard]] const object* owner() const;
[[nodiscard]] std::shared_ptr<object> owner() const;
[[nodiscard]] bool is_primary_key_constraint() const;
[[nodiscard]] bool is_foreign_key_constraint() const;
[[nodiscard]] bool is_unique_constraint() const;
@@ -40,7 +40,8 @@ private:
std::string name_;
std::variant<class attribute*, std::string> attr_;
object *owner_{nullptr};
std::shared_ptr<object> owner_;
std::shared_ptr<object> reference_;
utils::constraints options_{utils::constraints::None};
std::string ref_table_name_{};
std::string ref_column_name_{};
@@ -58,7 +59,6 @@ public:
private:
std::string constraint_name;
utils::constraints options_{utils::constraints::None};
std::shared_ptr<object> reference_;
std::string column_name;
std::string ref_table_name;
std::string ref_column_name;
include/matador/object/constraints_generator.hpp
+2 -2
View File
@@ -17,7 +17,7 @@ class repository;
class constraints_generator final {
private:
constraints_generator(std::list<class constraint> &constraints, const repository &repo, object &obj);
constraints_generator(std::list<class constraint> &constraints, const repository &repo, const std::shared_ptr<object> &obj);
public:
constraints_generator() = delete;
@@ -71,7 +71,7 @@ private:
private:
std::list<class constraint> &constraints_;
const repository &repo_;
object &obj_;
std::shared_ptr<object> obj_;
};
}
include/matador/object/object.hpp
+2 -2
View File
@@ -19,8 +19,8 @@ public:
static const attribute& create_attribute(std::string name, object& obj);
void add_attribute(attribute attr);
void add_constraint(class constraint c);
// void add_attribute(attribute attr);
// void add_constraint(class constraint c);
[[nodiscard]] attribute* primary_key_attribute() const;
[[nodiscard]] const utils::identifier& primary_key() const;
include/matador/object/object_generator.hpp
+10 -9
View File
@@ -50,23 +50,22 @@ private:
class object_generator {
private:
explicit object_generator(const repository& repo, std::unique_ptr<object> &&object);
explicit object_generator(repository& repo, const std::shared_ptr<object> &object);
public:
template < class Type >
static std::unique_ptr<object> generate(const repository &repo, const std::string &name, const std::string &alias = "") {
static std::shared_ptr<object> generate(const repository &repo, const std::string &name, const std::string &alias = "") {
return generate(std::make_unique<Type>(), repo, name, alias);
}
template < class Type >
static std::unique_ptr<object> generate(std::unique_ptr<Type>&& t, const repository &repo, const std::string &name, const std::string &alias = "") {
object_generator gen(repo, std::make_unique<object>(name, alias));
static std::shared_ptr<object> generate(std::unique_ptr<Type>&& t, repository &repo, const std::string &name, const std::string &alias = "") {
auto obj = std::make_shared<object>(name, alias);
object_generator gen(repo, obj);
access::process(gen, *t);
return gen.move();
return obj;
}
[[nodiscard]] std::unique_ptr<object> move() { return std::move(object_); }
template < class Type >
void on_primary_key(const char *, Type &x, const utils::primary_key_attribute& attr = utils::default_pk_attributes);
void on_revision(const char *id, uint64_t &rev);
@@ -114,9 +113,11 @@ private:
void prepare_primary_key(attribute &ref, utils::identifier &&pk) const;
std::shared_ptr<class object> fk_object(const std::type_index& ti) const;
private:
const repository &repo_;
std::unique_ptr<object> object_;
repository &repo_;
std::shared_ptr<object> object_;
};
template<typename ValueType>
include/matador/object/object_info.hpp
+1 -1
View File
@@ -14,7 +14,7 @@ public:
using create_func = std::function<std::unique_ptr<Type>()>;
object_info(const std::shared_ptr<repository_node>& node,
std::unique_ptr<class object> &&obj,
std::shared_ptr<class object> &&obj,
create_func&& creator)
: basic_object_info(node, std::move(obj))
, creator_(std::move(creator)){
include/matador/object/repository.hpp
+8 -1
View File
@@ -177,16 +177,22 @@ private:
static void insert_node(const node_ptr &parent, const node_ptr &child);
void remove_node(const node_ptr &node);
bool expecting_relation_node(const std::string &name) const;
[[nodiscard]] bool expecting_relation_node(const std::string &name) const;
void expect_relation_node(const std::string &name, const std::type_index &ti);
void remove_expected_relation_node(const std::string &name);
[[nodiscard]] std::shared_ptr<object> provide_object_in_advance(const std::type_index &ti, const std::shared_ptr<object>& obj);
[[nodiscard]] bool has_object_for_type(const std::type_index &ti) const;
[[nodiscard]] std::shared_ptr<object> object_for_type(const std::type_index &ti) const;
void remove_object_for_type(const std::type_index &ti);
private:
friend class internal::shadow_repository;
friend class repository_node;
friend class attribute_generator;
template < typename NodeType >
friend class foreign_node_completer;
friend class object_generator;
std::string name_;
std::shared_ptr<repository_node> root_;
@@ -197,6 +203,7 @@ private:
std::unordered_map<std::type_index, attribute*> missing_references_;
std::unordered_map<std::string, std::type_index> expected_relation_nodes_;
std::unordered_map<std::type_index, std::shared_ptr<object>> object_by_type_;
};
}