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

fixed has many and belongs to eager loading via sql join

Browse Source
This commit is contained in:
sascha
2025-02-16 19:57:14 +01:00
parent ec96c15905
commit 66d5bc6c86
8 changed files with 157 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/orm/session_query_builder.hpp
+48 -41
View File
@@ -26,43 +26,41 @@ class join_column_collector
{
public:
template<class Type>
join_columns collect()
{
join_columns collect() {
join_columns_ = {};
Type obj;
matador::access::process(*this, obj);
access::process(*this, obj);
return join_columns_;
}
template < class V >
void on_primary_key(const char * /*id*/, V &, typename std::enable_if<std::is_integral<V>::value && !std::is_same<bool, V>::value>::type* = 0) {}
void on_primary_key(const char * /*id*/, std::string &, size_t) {}
void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}
void on_primary_key(const char * /*id*/, V &, std::enable_if_t<std::is_integral_v<V> && !std::is_same_v<bool, V>>* = nullptr) {}
static void on_primary_key(const char * /*id*/, std::string &, size_t) {}
static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {}
template<typename Type>
void on_attribute(const char * /*id*/, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}
static void on_attribute(const char * /*id*/, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) {}
template<class Pointer>
void on_belongs_to(const char * /*id*/, Pointer &obj, const utils::foreign_attributes &attr) {}
static void on_belongs_to(const char * /*id*/, Pointer &obj, const utils::foreign_attributes &attr) {}
template<class Pointer>
void on_has_one(const char * /*id*/, Pointer &obj, const utils::foreign_attributes &attr) {}
static void on_has_one(const char * /*id*/, Pointer &obj, const utils::foreign_attributes &attr) {}
template<class ContainerType>
void on_has_many(ContainerType &, const char *join_column, const utils::foreign_attributes &attr) {}
static void on_has_many(ContainerType &, const char *join_column, const utils::foreign_attributes &attr) {}
template<class ContainerType>
void on_has_many_to_many(const char * /*id*/, ContainerType &/*c*/, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &/*attr*/)
{
void on_has_many_to_many(const char * /*id*/, ContainerType &/*c*/, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &/*attr*/) {
join_columns_.join_column = join_column;
join_columns_.inverse_join_column = inverse_join_column;
}
template<class ContainerType>
void on_has_many_to_many(const char * /*id*/, ContainerType &/*c*/, const utils::foreign_attributes &/*attr*/) {}
static void on_has_many_to_many(const char * /*id*/, ContainerType &/*c*/, const utils::foreign_attributes &/*attr*/) {}
private:
join_columns join_columns_;
};
struct entity_query_data {
std::string root_table_name;
std::string pk_column_{};
std::shared_ptr<sql::table> root_table;
std::string pk_column_name{};
std::vector<sql::column> columns{};
std::vector<query::join_data> joins{};
std::unique_ptr<query::basic_condition> where_clause{};
@@ -100,10 +98,10 @@ public:
}
pk_ = pk;
table_info_stack_.push(info.value());
processed_tables_.insert(info->get().name());
entity_query_data_ = { info.value().get().name() };
entity_query_data_ = { std::make_shared<sql::table>(info.value().get().name(), build_alias('t', ++table_index)) };
processed_tables_.insert({info->get().name(), entity_query_data_.root_table});
try {
access::process(*this, info.value().get().prototype());
access::process(*this, info->get().prototype());
return {utils::ok(std::move(entity_query_data_))};
} catch (const query_builder_exception &ex) {
@@ -121,7 +119,8 @@ public:
}
pk_ = nullptr;
table_info_stack_.push(info.value());
entity_query_data_ = { info->get().name() };
entity_query_data_ = { std::make_shared<sql::table>(info.value().get().name(), build_alias('t', ++table_index)) };
processed_tables_.insert({info->get().name(), entity_query_data_.root_table});
try {
access::process(*this, info->get().prototype());
@@ -141,15 +140,14 @@ public:
return;
}
if (pk_.is_null()) {
entity_query_data_.pk_column_ = id;
entity_query_data_.pk_column_name = id;
} else if (pk_.is_integer()) {
auto t = std::make_shared<sql::table>(table_info_stack_.top().get().name());
const auto t = std::make_shared<sql::table>(table_info_stack_.top().get().name());
auto v = *pk_.as<V>();
auto c = sql::column{t, id, ""};
auto co = std::make_unique<query::condition<sql::column, V>>(c, query::basic_condition::operand_type::EQUAL, v);
entity_query_data_.where_clause = std::move(co);
// entity_query_data_.where_clause = query::make_condition(c == v);
entity_query_data_.pk_column_ = id;
entity_query_data_.pk_column_name = id;
}
}
@@ -182,13 +180,16 @@ public:
throw query_builder_exception{query_build_error::UnknownType};
}
auto curr = table_info_stack_.top().get().name();
auto next = info.value().get().name();
if (processed_tables_.count(next) > 0) {
const auto curr = processed_tables_.find(table_info_stack_.top().get().name());
if (curr == processed_tables_.end()) {
throw query_builder_exception{query_build_error::UnexpectedError};
};
auto next = processed_tables_.find(info->get().name());
if (next != processed_tables_.end()) {
return;
}
table_info_stack_.push(info.value());
processed_tables_.insert(next);
next = processed_tables_.insert({info->get().name(), std::make_shared<sql::table>(info->get().name(), build_alias('t', ++table_index))}).first;
typename ContainerType::value_type::value_type obj;
access::process(*this , obj);
table_info_stack_.pop();
@@ -199,14 +200,14 @@ public:
}
append_join(
sql::column{std::make_shared<sql::table>(table_info_stack_.top().get().name()), table_info_stack_.top().get().definition().primary_key()->name()},
sql::column{std::make_shared<sql::table>(info->get().name()), join_column}
sql::column{curr->second, table_info_stack_.top().get().definition().primary_key()->name()},
sql::column{next->second, join_column}
);
}
}
template<class ContainerType>
void on_has_many_to_many(const char *id, ContainerType &c, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &attr)
void on_has_many_to_many(const char *id, ContainerType &/*cont*/, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &attr)
{
if (attr.fetch() != utils::fetch_type::EAGER) {
return;
@@ -217,7 +218,7 @@ public:
}
table_info_stack_.push(info.value());
typename ContainerType::value_type::value_type obj;
matador::access::process(*this , obj);
access::process(*this , obj);
table_info_stack_.pop();
auto pk = info->get().definition().primary_key();
@@ -236,7 +237,7 @@ public:
}
template<class ContainerType>
void on_has_many_to_many(const char *id, ContainerType &c, const utils::foreign_attributes &attr)
void on_has_many_to_many(const char *id, ContainerType &/*cont*/, const utils::foreign_attributes &attr)
{
if (attr.fetch() != utils::fetch_type::EAGER) {
return;
@@ -247,7 +248,7 @@ public:
}
table_info_stack_.push(info.value());
typename ContainerType::value_type::value_type obj;
matador::access::process(*this , obj);
access::process(*this , obj);
table_info_stack_.pop();
auto pk = info->get().definition().primary_key();
@@ -271,16 +272,18 @@ private:
template<class Pointer>
void on_foreign_object(const char *id, Pointer &, const utils::foreign_attributes &attr);
void push(const std::string &column_name);
static std::string build_alias(char prefix, unsigned int count);
[[nodiscard]] bool is_root_entity() const;
void append_join(const sql::column &left, const sql::column &right);
private:
utils::value pk_;
std::stack<std::reference_wrapper<const object::basic_object_info>> table_info_stack_;
std::unordered_set<std::string> processed_tables_;
std::unordered_map<std::string, std::shared_ptr<sql::table>> processed_tables_;
const object::schema &schema_;
entity_query_data entity_query_data_;
int column_index{0};
unsigned int column_index{0};
unsigned int table_index{0};
join_column_collector join_column_collector_;
};
@@ -292,12 +295,16 @@ void session_query_builder::on_foreign_object(const char *id, Pointer &, const u
if (!info) {
throw query_builder_exception{query_build_error::UnknownType};
}
auto curr = table_info_stack_.top().get().name();
auto next = info.value().get().name();
if (processed_tables_.count(next) > 0) {
const auto curr = processed_tables_.find(table_info_stack_.top().get().name());
if (curr == processed_tables_.end()) {
throw query_builder_exception{query_build_error::UnexpectedError};
};
auto next = processed_tables_.find(info->get().name());
if (next != processed_tables_.end()) {
return;
}
processed_tables_.insert(next);
next = processed_tables_.insert({info->get().name(), std::make_shared<sql::table>(info->get().name(), build_alias('t', ++table_index))}).first;
table_info_stack_.push(info.value());
typename Pointer::value_type obj;
access::process(*this, obj);
@@ -308,8 +315,8 @@ void session_query_builder::on_foreign_object(const char *id, Pointer &, const u
throw query_builder_exception{query_build_error::MissingPrimaryKey};
}
append_join(
sql::column{std::make_shared<sql::table>(table_info_stack_.top().get().name()), id},
sql::column{std::make_shared<sql::table>(info->get().name()), pk->name()}
sql::column{curr->second, id},
sql::column{next->second, pk->name()}
);
} else {
push(id);
include/matador/sql/column.hpp
+1 -1
View File
@@ -23,7 +23,7 @@ struct column
column(const char *name, const std::string& as = ""); // NOLINT(*-explicit-constructor)
explicit column(std::string name, std::string as = ""); // NOLINT(*-explicit-constructor)
column(sql_function_t func, std::string name); // NOLINT(*-explicit-constructor)
column(const struct table &t, std::string name, std::string as = "");
column(const struct table &tab, std::string name, std::string as = "");
column(const std::shared_ptr<table> &t, std::string name, std::string as = "");
[[nodiscard]] bool equals(const column &x) const;