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

resolve has one progress

Browse Source
This commit is contained in:
sascha
2026-05-17 21:46:43 +02:00
parent 57703dfb67
commit 9f54716df2
16 changed files with 86 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/core/object/abstract_joined_resolver.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "matador/object/abstract_collection_resolver.hpp"
#include "matador/object/abstract_joined_resolver.hpp"
namespace matador::object {
const std::type_index& abstract_joined_resolver::root_type() const {
source/orm/query/basic_schema.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ const std::unordered_map<object::collection_composite_key, std::unique_ptr<sql::
return collection_resolver_producers_;
}
const std::unordered_map<object::collection_composite_key, std::unique_ptr<sql::object_resolver_producer>, object::collection_composite_key_hash>& basic_schema::joined_object_resolver_producers() const {
const std::unordered_map<object::collection_composite_key, std::unique_ptr<sql::joined_object_resolver_producer>, object::collection_composite_key_hash>& basic_schema::joined_object_resolver_producers() const {
return joined_object_resolver_producers_;
}
source/orm/query/session.cpp
+2 -2
View File
@@ -93,12 +93,12 @@ session::session(session_context&& ctx, const basic_schema &scm)
}
}
for (const auto &pair : schema_.joined_object_resolver_producers()) {
for (const auto &pair : schema_.joined_object_resolver_producers()) {
auto res = pair.second->build_query(dialect_).and_then([this](sql::query_context&& query_ctx) -> result<sql::statement, error> {
query_ctx.resolver = resolver_service_;
return cache_.acquire(query_ctx);
}).and_then([&pair, this](sql::statement&& stmt) -> result<void, error> {
resolver_service_->register_collection_resolver(pair.second->produce(std::move(stmt), *resolver_service_));
resolver_service_->register_joined_object_resolver(pair.second->produce(std::move(stmt)), pair.second->root_type(), pair.second->collection_name());
return ok<void>();
}).or_else([](const auto &err) {
source/orm/sql/producer_resolver_factory.cpp
+5 -5
View File
@@ -26,9 +26,9 @@ void producer_collection_resolver_factory::register_collection_resolver(std::sha
resolvers_[key] = std::move(resolver);
}
std::shared_ptr<object::abstract_joined_resolver> producer_joined_object_resolver_factory::acquire_joined_object_resolver(const std::type_index& root_type,
const std::type_index& element_type,
const std::string& collection_name) const {
std::shared_ptr<object::abstract_type_resolver> producer_joined_object_resolver_factory::acquire_joined_object_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};
if (const auto it = resolvers_.find(key); it != resolvers_.end()) {
return it->second;
@@ -36,8 +36,8 @@ std::shared_ptr<object::abstract_joined_resolver> producer_joined_object_resolve
return nullptr;
}
void producer_joined_object_resolver_factory::register_joined_object_resolver(std::shared_ptr<object::abstract_joined_resolver>&& resolver) {
const object::collection_composite_key key{resolver->root_type(), resolver->type(), resolver->collection_name()};
void producer_joined_object_resolver_factory::register_joined_object_resolver(std::shared_ptr<object::abstract_type_resolver>&& resolver, const std::type_index& root_type, const std::string& join_column) {
const object::collection_composite_key key{root_type, resolver->type(), join_column};
resolvers_[key] = std::move(resolver);
}
} // namespace matador::sql
source/orm/sql/resolver_service.cpp
+2 -2
View File
@@ -9,7 +9,7 @@ void resolver_service::register_collection_resolver(std::shared_ptr<object::abst
collection_resolver_factory_.register_collection_resolver(std::move(resolver));
}
void resolver_service::register_joined_object_resolver(std::shared_ptr<object::abstract_type_resolver>&& resolver) {
joined_object_resolver_factory_.register_object_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) {
joined_object_resolver_factory_.register_joined_object_resolver(std::move(resolver), root_type, join_column);
}
} // namespace matador::query