renamed collection resolver producer related classes

This commit is contained in:
2026-05-18 09:03:24 +02:00
parent bf99642af4
commit 820b5432b2
16 changed files with 74 additions and 75 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ add_library(matador-core STATIC
../../include/matador/object/basic_repository.hpp
../../include/matador/object/collection_proxy.hpp
../../include/matador/object/collection_resolver.hpp
../../include/matador/object/collection_resolver_factory.hpp
../../include/matador/object/joined_collection_resolver_factory.hpp
../../include/matador/object/collection_utils.hpp
../../include/matador/object/error_code.hpp
../../include/matador/object/foreign_node_completer.hpp
+4 -4
View File
@@ -104,7 +104,7 @@ add_library(matador-orm STATIC
../../include/matador/sql/interface/query_result_reader.hpp
../../include/matador/sql/interface/statement_impl.hpp
../../include/matador/sql/interface/statement_proxy.hpp
../../include/matador/sql/internal/collection_resolver_producer.hpp
../../include/matador/sql/internal/joined_collection_resolver_producer.hpp
../../include/matador/sql/internal/identifier_reader.hpp
../../include/matador/sql/internal/identifier_statement_binder.hpp
../../include/matador/sql/internal/object_resolver_producer.hpp
@@ -113,7 +113,7 @@ add_library(matador-orm STATIC
../../include/matador/sql/internal/query_result_impl.hpp
../../include/matador/sql/internal/query_result_pk_resolver.hpp
../../include/matador/sql/internal/statement_object_resolver.hpp
../../include/matador/sql/producer_resolver_factory.hpp
../../include/matador/sql/producer_object_resolver_factory.hpp
../../include/matador/sql/query_context.hpp
../../include/matador/sql/query_result.hpp
../../include/matador/sql/record.hpp
@@ -208,14 +208,14 @@ add_library(matador-orm STATIC
sql/interface/query_result_reader.cpp
sql/interface/statement_impl.cpp
sql/interface/statement_proxy.cpp
sql/internal/collection_resolver_producer.cpp
sql/internal/joined_collection_resolver_producer.cpp
sql/internal/identifier_reader.cpp
sql/internal/identifier_statement_binder.cpp
sql/internal/object_resolver_producer.cpp
sql/internal/object_result_binder.cpp
sql/internal/query_result_pk_resolver.cpp
sql/object_parameter_binder.cpp
sql/producer_resolver_factory.cpp
sql/producer_object_resolver_factory.cpp
sql/query_result.cpp
sql/record.cpp
sql/resolver_service.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ const std::unordered_map<std::type_index, std::unique_ptr<sql::object_resolver_p
return resolver_producers_;
}
const std::unordered_map<object::collection_composite_key, std::unique_ptr<sql::collection_resolver_producer>, object::collection_composite_key_hash> & basic_schema::collection_resolver_producers() const {
const std::unordered_map<object::collection_composite_key, std::unique_ptr<sql::joined_collection_resolver_producer>, object::collection_composite_key_hash> & basic_schema::collection_resolver_producers() const {
return collection_resolver_producers_;
}
@@ -1,20 +0,0 @@
#include "matador/sql/internal/collection_resolver_producer.hpp"
namespace matador::sql {
const std::type_index& collection_resolver_producer::root_type() const {
return root_type_;
}
const std::type_index& collection_resolver_producer::type() const {
return type_;
}
const std::string& collection_resolver_producer::collection_name() const {
return collection_name_;
}
collection_resolver_producer::collection_resolver_producer(const std::type_index& root_type,
const std::type_index& type,
std::string collection_name)
: root_type_(root_type), type_(type), collection_name_(std::move(collection_name)) {}
} // namespace matador::sql
@@ -0,0 +1,20 @@
#include "matador/sql/internal/joined_collection_resolver_producer.hpp"
namespace matador::sql {
const std::type_index& joined_collection_resolver_producer::root_type() const {
return root_type_;
}
const std::type_index& joined_collection_resolver_producer::type() const {
return type_;
}
const std::string& joined_collection_resolver_producer::join_column_name() const {
return join_column_name_;
}
joined_collection_resolver_producer::joined_collection_resolver_producer(const std::type_index& root_type,
const std::type_index& type,
std::string join_column_name)
: root_type_(root_type), type_(type), join_column_name_(std::move(join_column_name)) {}
} // namespace matador::sql
@@ -1,18 +1,18 @@
#include "matador/sql/producer_resolver_factory.hpp"
#include "matador/sql/producer_object_resolver_factory.hpp"
namespace matador::sql {
std::shared_ptr<object::abstract_type_resolver> producer_resolver_factory::acquire_object_resolver(const std::type_index &type) const {
std::shared_ptr<object::abstract_type_resolver> producer_object_resolver_factory::acquire_object_resolver(const std::type_index &type) const {
if (const auto it = resolvers_.find(type); it != resolvers_.end()) {
return it->second;
}
return nullptr;
}
void producer_resolver_factory::register_object_resolver(std::shared_ptr<object::abstract_type_resolver> &&resolver) {
void producer_object_resolver_factory::register_object_resolver(std::shared_ptr<object::abstract_type_resolver> &&resolver) {
resolvers_[resolver->type()] = std::move(resolver);
}
std::shared_ptr<object::abstract_joined_resolver>
producer_collection_resolver_factory::acquire_collection_resolver(const std::type_index& root_type,
producer_joined_collection_resolver_factory::acquire_collection_resolver(const std::type_index& root_type,
const std::type_index& element_type,
const std::string& collection_name) const {
const object::collection_composite_key key{root_type, element_type, collection_name};
@@ -21,7 +21,7 @@ producer_collection_resolver_factory::acquire_collection_resolver(const std::typ
}
return nullptr;
}
void producer_collection_resolver_factory::register_collection_resolver(std::shared_ptr<object::abstract_joined_resolver>&& resolver) {
void producer_joined_collection_resolver_factory::register_collection_resolver(std::shared_ptr<object::abstract_joined_resolver>&& resolver) {
const object::collection_composite_key key{resolver->root_type(), resolver->type(), resolver->collection_name()};
resolvers_[key] = std::move(resolver);
}
+1 -1
View File
@@ -6,7 +6,7 @@ void resolver_service::register_object_resolver(std::shared_ptr<object::abstract
}
void resolver_service::register_collection_resolver(std::shared_ptr<object::abstract_joined_resolver>&& resolver) {
collection_resolver_factory_.register_collection_resolver(std::move(resolver));
joined_collection_resolver_factory_.register_collection_resolver(std::move(resolver));
}
void resolver_service::register_joined_object_resolver(std::shared_ptr<object::abstract_type_resolver>&& resolver, const std::type_index& root_type, const std::string& join_column) {