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

renamed collection resolver producer related classes

Browse Source
This commit is contained in:
sascha
2026-05-18 09:03:24 +02:00
parent bf99642af4
commit 820b5432b2
16 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/sql/internal/collection_resolver_producer.hpp → include/matador/sql/internal/joined_collection_resolver_producer.hpp
+5 -5
View File
@@ -14,23 +14,23 @@ namespace matador::sql {
class dialect;
class statement;
class resolver_service;
class collection_resolver_producer {
class joined_collection_resolver_producer {
public:
virtual ~collection_resolver_producer() = default;
virtual ~joined_collection_resolver_producer() = default;
virtual utils::result<query_context, utils::error> build_query(const dialect& d) = 0;
virtual std::shared_ptr<object::abstract_joined_resolver> produce(statement&& stmt, const resolver_service& rs) = 0;
[[nodiscard]] const std::type_index& root_type() const;
[[nodiscard]] const std::type_index& type() const;
[[nodiscard]] const std::string& collection_name() const;
[[nodiscard]] const std::string& join_column_name() const;
protected:
explicit collection_resolver_producer(const std::type_index &root_type, const std::type_index &type, std::string collection_name);
explicit joined_collection_resolver_producer(const std::type_index &root_type, const std::type_index &type, std::string join_column_name);
private:
std::type_index root_type_;
std::type_index type_;
std::string collection_name_;
std::string join_column_name_;
};
}
#endif // MATADOR_COLLECTION_RESOLVER_PRODUCER_HPP
include/matador/sql/internal/query_result_impl.hpp
+4 -4
View File
@@ -147,7 +147,7 @@ template <class CollectionType>
void query_result_impl::on_has_many(const char *, CollectionType &cont, const char *join_column, const utils::foreign_attributes &attr, std::enable_if_t<object::is_object_ptr<typename CollectionType::value_type>::value> *) {
using value_type = typename CollectionType::value_type::value_type;
auto object_resolver = resolver_->object_resolver<value_type>();
auto resolver = resolver_->collection_resolver<typename CollectionType::value_type>(result_type_, join_column);
auto resolver = resolver_->joined_collection_resolver<typename CollectionType::value_type>(result_type_, join_column);
if (attr.fetch() == utils::fetch_type::Lazy) {
cont.reset(std::make_shared<object::collection_proxy<typename CollectionType::value_type>>(resolver, current_pk_));
@@ -172,7 +172,7 @@ template <class CollectionType>
void query_result_impl::on_has_many(const char *id, CollectionType &cont, const char *join_column, const utils::foreign_attributes &attr, std::enable_if_t<!object::is_object_ptr<typename CollectionType::value_type>::value> *) {
using value_type = typename CollectionType::value_type;
auto object_resolver = resolver_->object_resolver<value_type>();
auto resolver = resolver_->collection_resolver<value_type>(result_type_, join_column);
auto resolver = resolver_->joined_collection_resolver<value_type>(result_type_, join_column);
if (attr.fetch() == utils::fetch_type::Lazy) {
cont.reset(std::make_shared<object::collection_proxy<value_type>>(resolver, current_pk_));
@@ -192,7 +192,7 @@ template <class CollectionType>
void query_result_impl::on_has_many_to_many(const char *id, CollectionType &cont, const char *join_column, const char *, const utils::foreign_attributes &attr) {
using value_type = typename CollectionType::value_type::value_type;
auto object_resolver = resolver_->object_resolver<value_type>();
auto resolver = resolver_->collection_resolver<typename CollectionType::value_type>(result_type_, join_column);
auto resolver = resolver_->joined_collection_resolver<typename CollectionType::value_type>(result_type_, join_column);
if (attr.fetch() == utils::fetch_type::Lazy) {
cont.reset(std::make_shared<object::collection_proxy<typename CollectionType::value_type>>(resolver, current_pk_));
} else {
@@ -220,7 +220,7 @@ void query_result_impl::on_has_many_to_many(const char *id, CollectionType &cont
const auto jc = collector.collect<typename CollectionType::value_type::value_type>();
auto object_resolver = resolver_->object_resolver<value_type>();
auto resolver = resolver_->collection_resolver<typename CollectionType::value_type>(result_type_, jc.inverse_join_column);
auto resolver = resolver_->joined_collection_resolver<typename CollectionType::value_type>(result_type_, jc.inverse_join_column);
if (attr.fetch() == utils::fetch_type::Lazy) {
cont.reset(std::make_shared<object::collection_proxy<typename CollectionType::value_type>>(resolver, current_pk_));
} else {
include/matador/sql/producer_resolver_factory.hpp → include/matador/sql/producer_object_resolver_factory.hpp
+3 -3
View File
@@ -5,13 +5,13 @@
#include "matador/object/abstract_joined_resolver.hpp"
#include "matador/object/object_resolver_factory.hpp"
#include "matador/object/collection_resolver_factory.hpp"
#include "matador/object/joined_collection_resolver_factory.hpp"
#include "matador/object/collection_utils.hpp"
namespace matador::sql {
class executor;
class producer_resolver_factory : public object::object_resolver_factory {
class producer_object_resolver_factory : public object::object_resolver_factory {
public:
[[nodiscard]] std::shared_ptr<object::abstract_type_resolver> acquire_object_resolver(const std::type_index &type) const override;
void register_object_resolver(std::shared_ptr<object::abstract_type_resolver> &&resolver) override;
@@ -20,7 +20,7 @@ private:
std::unordered_map<std::type_index, std::shared_ptr<object::abstract_type_resolver>> resolvers_;
};
class producer_collection_resolver_factory : public object::collection_resolver_factory {
class producer_joined_collection_resolver_factory : public object::joined_collection_resolver_factory {
public:
[[nodiscard]] std::shared_ptr<object::abstract_joined_resolver> acquire_collection_resolver(const std::type_index& root_type,
const std::type_index& element_type,
include/matador/sql/resolver_service.hpp
+5 -5
View File
@@ -1,7 +1,7 @@
#ifndef MATADOR_RESOLVER_SERVICE_HPP
#define MATADOR_RESOLVER_SERVICE_HPP
#include "matador/sql/producer_resolver_factory.hpp"
#include "matador/sql/producer_object_resolver_factory.hpp"
namespace matador::sql {
class resolver_service {
@@ -12,8 +12,8 @@ public:
}
template<class Type>
std::shared_ptr<object::collection_resolver<Type>> collection_resolver(const std::type_index &root_type, const std::string &collection_name) const {
return collection_resolver_factory_.resolver<Type>(root_type, collection_name);
std::shared_ptr<object::collection_resolver<Type>> joined_collection_resolver(const std::type_index &root_type, const std::string &collection_name) const {
return joined_collection_resolver_factory_.resolver<Type>(root_type, collection_name);
}
template<class Type>
@@ -26,8 +26,8 @@ public:
void register_joined_object_resolver(std::shared_ptr<object::abstract_type_resolver>&& resolver, const std::type_index& root_type, const std::string& join_column);
private:
producer_resolver_factory object_resolver_factory_;
producer_collection_resolver_factory collection_resolver_factory_;
producer_object_resolver_factory object_resolver_factory_;
producer_joined_collection_resolver_factory joined_collection_resolver_factory_;
producer_joined_object_resolver_factory joined_object_resolver_factory_;
};
}