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

removed make_relation_node method from repository_node

Browse Source
This commit is contained in:
sascha
2025-12-08 19:45:35 +01:00
parent 263c202c69
commit d4ef97ef5a
15 changed files with 90 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/object/repository_node.hpp
+5 -28
View File
@@ -4,7 +4,6 @@
#include "matador/object/attribute_generator.hpp"
#include "matador/object/object_generator.hpp"
#include "matador/object/object_info.hpp"
#include "matador/object/primary_key_resolver.hpp"
#include <memory>
@@ -16,42 +15,24 @@ class repository;
class repository_node final {
public:
using node_ptr = std::shared_ptr<repository_node>;
template< typename Type>
using creator_func = std::function<std::unique_ptr<Type>()>;
template < typename Type >
static std::shared_ptr<repository_node> make_node(repository& repo, const std::string& name) {
static std::shared_ptr<repository_node> make_node(repository& repo, const std::string& name, creator_func<Type> creator = []{ return std::make_unique<Type>(); }) {
auto node = std::shared_ptr<repository_node>(new repository_node(repo, name, typeid(Type)));
primary_key_resolver resolver;
auto pk_info = resolver.resolve<Type>();
auto obj = object_generator::generate<Type>(repo, name);
auto obj = object_generator::generate<Type>(creator(), repo, name);
auto info = std::make_unique<object_info<Type>>(
node,
std::move(obj),
[]{ return std::make_unique<Type>(); }
std::forward<creator_func<Type>>(creator)
);
node->info_ = std::move(info);
return node;
}
template < typename Type, typename CreatorFunc >
static utils::result<node_ptr, utils::error> make_relation_node(repository& repo, const std::string& name, CreatorFunc &&creator) {
const auto result = make_and_attach_node(repo, name, typeid(Type));
if (!result) {
return result;
}
auto obj = object_generator::generate(creator(), repo, name);
auto info = std::make_unique<object_info<Type>>(
result.value(),
std::move(obj),
std::forward<CreatorFunc>(creator)
);
result.value()->info_ = std::move(info);
return result;
}
static std::shared_ptr<repository_node> make_null_node(repository& repo);
repository_node(const repository_node& other) = delete;
@@ -87,10 +68,6 @@ private:
void unlink();
static utils::result<node_ptr, utils::error> make_and_attach_node(repository& repo, const std::string& name, const std::type_index& ti);
static attribute* determine_reference_column(const std::type_index& ti,
const std::string& table_name,
const primary_key_info& pk_info,
repository& repo);
private:
friend class repository;