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

uses criteria for session::find methods

Browse Source
This commit is contained in:
Sascha Kühl
2025-10-30 14:54:39 +01:00
parent 44c50cf2af
commit 270c2922ff
23 changed files with 267 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/orm/error_code.hpp
+1
View File
@@ -10,6 +10,7 @@ enum class error_code : uint8_t {
Ok = 0,
NoConnectionAvailable,
UnknownType,
NoPrimaryKey,
FailedToBuildQuery,
FailedToFindObject,
Failed
include/matador/orm/session.hpp
+14 -30
View File
@@ -121,9 +121,7 @@ public:
template<typename Type, typename PrimaryKeyType>
utils::result<object::object_ptr<Type>, utils::error> find(const PrimaryKeyType &pk);
template<typename Type>
utils::result<sql::query_result<Type>, utils::error> find();
// template<typename Type, typename Condition>
// utils::result<sql::query_result<Type>, utils::error> find(const Condition &cond);
utils::result<sql::query_result<Type>, utils::error> find(query::criteria_ptr clause = {});
template<typename Type>
utils::result<void, utils::error> drop_table();
@@ -291,16 +289,23 @@ utils::result<void, utils::error> session::remove( const object::object_ptr<Type
}
template<typename Type, typename PrimaryKeyType>
utils::result<object::object_ptr<Type>, utils::error> session::find( const PrimaryKeyType& pk ) {
utils::result<object::object_ptr<Type>, utils::error> session::find(const PrimaryKeyType& pk) {
auto info = schema_->info<Type>();
if (!info) {
return utils::failure(make_error(error_code::UnknownType, "Failed to determine requested type."));
}
if (!info.value().get().definition().has_primary_key()) {
return utils::failure(make_error(error_code::NoPrimaryKey, "Type hasn't primary key."));
}
const auto& type_info = info.value().get();
session_query_builder eqb(*schema_, *this);
auto data = eqb.build<Type>(pk);
const sql::column col(sql::table{type_info.reference_column()->table_name()}, type_info.reference_column()->name());
using namespace matador::query;
auto data = eqb.build<Type>(col == utils::_);
if (!data.is_ok()) {
return utils::failure(make_error(error_code::FailedToBuildQuery, "Failed to build query for type " + info->get().name() + "."));
return utils::failure(make_error(error_code::FailedToBuildQuery, "Failed to build query for type " + type_info.name() + "."));
}
auto res = build_select_query(data.release()).prepare(*this);
@@ -310,20 +315,20 @@ utils::result<object::object_ptr<Type>, utils::error> session::find( const Prima
}
auto stmt_result = res->bind(0, const_cast<PrimaryKeyType&>(pk)).template fetch_one<Type>();
if (stmt_result && !stmt_result.value()) {
return utils::failure(make_error(error_code::FailedToFindObject, "Failed to find object of type " + info->get().name() + " with primary key " + std::to_string(pk) + "."));
return utils::failure(make_error(error_code::FailedToFindObject, "Failed to find object of type " + type_info.name() + " with primary key " + std::to_string(pk) + "."));
}
return utils::ok(object::object_ptr<Type>{ stmt_result->release() });
}
template<typename Type>
utils::result<sql::query_result<Type>, utils::error> session::find() {
utils::result<sql::query_result<Type>, utils::error> session::find(query::criteria_ptr clause) {
auto info = schema_->info<Type>();
if (!info) {
return utils::failure(make_error(error_code::UnknownType, "Failed to determine requested type."));
}
session_query_builder eqb(*schema_, *this);
auto data = eqb.build<Type>();
auto data = eqb.build<Type>(std::move(clause));
if (!data.is_ok()) {
return utils::failure(make_error(error_code::FailedToBuildQuery, "Failed to build query for type " + info->get().name() + "."));
}
@@ -336,27 +341,6 @@ utils::result<sql::query_result<Type>, utils::error> session::find() {
return result->template fetch<Type>();
}
// template<typename Type, typename Condition>
// utils::result<sql::query_result<Type>, utils::error> session::find(const Condition &cond) {
// auto info = schema_->info<Type>();
// if (!info) {
// return utils::failure(make_error(error_code::UnknownType, "Failed to determine requested type."));
// }
//
// session_query_builder eqb(*schema_, *this);
// auto data = eqb.build<Type>();
// if (!data.is_ok()) {
// return utils::failure(make_error(error_code::FailedToBuildQuery, "Failed to build query for type " + info->get().name() + "."));
// }
//
// auto result = build_select_query(data.release()).prepare(*this);
// if (!result.is_ok()) {
// return utils::failure(result.err());
// }
//
// return result->template fetch<Type>();
// }
//
template<typename Type>
utils::result<void, utils::error> session::drop_table() {
auto info = schema_->info<Type>();
include/matador/orm/session_query_builder.hpp
+28 -32
View File
@@ -11,6 +11,7 @@
#include "matador/object/join_columns_collector.hpp"
#include "matador/object/repository.hpp"
#include "matador/query/criteria/criteria_visitor.hpp"
#include "matador/utils/primary_key_attribute.hpp"
#include "matador/utils/result.hpp"
@@ -30,46 +31,49 @@ struct entity_query_data {
query::criteria_ptr where_clause;
};
class criteria_transformer final : public query::criteria_visitor {
public:
criteria_transformer(const object::repository &repo, const std::unordered_map<std::string, std::shared_ptr<sql::table>>& tables_by_name);
void visit( const query::between_criteria& node ) override;
void visit( const query::binary_criteria& node ) override;
void visit( const query::binary_column_criteria& node ) override;
void visit( const query::collection_criteria& node ) override;
void visit( const query::collection_query_criteria& node ) override;
void visit( const query::like_criteria& node ) override;
void visit( const query::logical_criteria& node ) override;
void visit( const query::not_criteria& node ) override;
private:
void update_criteria_column(const query::abstract_column_criteria& node) const;
private:
const object::repository &repo_;
const std::unordered_map<std::string, std::shared_ptr<sql::table>>& tables_by_name_;
};
class session_query_builder final {
public:
session_query_builder(const object::repository &scm, sql::executor &exec)
: schema_(scm)
, executor_(exec){}
template<class EntityType, typename PrimaryKeyType>
utils::result<entity_query_data, query_build_error> build(const PrimaryKeyType &pk) {
auto info = schema_.info<EntityType>();
if (!info) {
return utils::failure(query_build_error::UnknownType);
}
pk_ = pk;
table_info_stack_.push({info.value(), std::make_shared<sql::table>(info.value().get().name(), build_alias('t', ++table_index))});
entity_query_data_ = { table_info_stack_.top().table };
processed_tables_.insert({info->get().name(), entity_query_data_.root_table});
try {
access::process(*this, info->get().prototype());
return {utils::ok(std::move(entity_query_data_))};
} catch (const query_builder_exception &ex) {
return {utils::failure(ex.error_type())};
} catch (...) {
return {utils::failure(query_build_error::UnexpectedError)};
}
}
template<class EntityType>
utils::result<entity_query_data, query_build_error> build() {
utils::result<entity_query_data, query_build_error> build(query::criteria_ptr clause = {}) {
const auto info = schema_.info<EntityType>();
if (!info) {
return utils::failure(query_build_error::UnknownType);
}
pk_ = nullptr;
table_info_stack_.push({info.value(), std::make_shared<sql::table>(info.value().get().name(), build_alias('t', ++table_index))});
entity_query_data_ = { table_info_stack_.top().table };
processed_tables_.insert({info->get().name(), entity_query_data_.root_table});
try {
access::process(*this, info->get().prototype());
if (clause) {
criteria_transformer transformer{schema_, processed_tables_};
clause->accept(transformer);
entity_query_data_.where_clause = std::move(clause);
}
return {utils::ok(std::move(entity_query_data_))};
} catch (const query_builder_exception &ex) {
return {utils::failure(ex.error_type())};
@@ -79,19 +83,12 @@ public:
}
template < class V >
void on_primary_key(const char *id, V &, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes)
{
void on_primary_key(const char *id, V &, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {
push(id);
if (!is_root_entity()) {
return;
}
entity_query_data_.pk_column_name = id;
if (!pk_.is_null()) {
const auto c = sql::column{table_info_stack_.top().table, id, ""};
using namespace matador::query;
auto co = c == utils::_;
entity_query_data_.where_clause = std::move(co);
}
}
void on_revision(const char *id, uint64_t &/*rev*/);
@@ -235,7 +232,6 @@ private:
void append_join(const sql::column &left, const sql::column &right);
private:
utils::value pk_;
struct table_info {
std::reference_wrapper<const object::basic_object_info> info;
std::shared_ptr<sql::table> table;
include/matador/query/criteria/abstract_column_criteria.hpp
+22
View File
@@ -0,0 +1,22 @@
#ifndef MATADOR_ABSTRACT_COLUMN_CRITERIA_HPP
#define MATADOR_ABSTRACT_COLUMN_CRITERIA_HPP
#include "matador/query/criteria/abstract_criteria.hpp"
#include "matador/sql/column.hpp"
namespace matador::query {
class abstract_column_criteria : public abstract_criteria {
public:
abstract_column_criteria() = delete;
explicit abstract_column_criteria(sql::column column);
[[nodiscard]] const sql::column& column() const;
protected:
sql::column column_;
};
}
#endif //MATADOR_ABSTRACT_COLUMN_CRITERIA_HPP
include/matador/query/criteria/between_criteria.hpp
+2 -6
View File
@@ -1,16 +1,14 @@
#ifndef CRITERIA_BETWEEN_CRITERIA_NODE_HPP
#define CRITERIA_BETWEEN_CRITERIA_NODE_HPP
#include "matador/query/criteria/abstract_criteria.hpp"
#include "matador/query/criteria/abstract_column_criteria.hpp"
#include "matador/query/criteria/criteria_utils.hpp"
#include "matador/sql/column.hpp"
#include "matador/utils/value.hpp"
namespace matador::query {
class between_criteria final : public abstract_criteria {
class between_criteria final : public abstract_column_criteria {
public:
between_criteria() = delete;
between_criteria(sql::column column, int64_t min, int64_t max);
@@ -18,12 +16,10 @@ public:
void accept(criteria_visitor& visitor) const override;
[[nodiscard]] const sql::column& column() const;
[[nodiscard]] const criteria_value &minimum() const;
[[nodiscard]] const criteria_value &maximum() const;
private:
sql::column column_;
criteria_value min_;
criteria_value max_;
};
include/matador/query/criteria/binary_criteria.hpp
+2 -4
View File
@@ -1,7 +1,7 @@
#ifndef CRITERIA_BINARY_CRITERIA_NODE_HPP
#define CRITERIA_BINARY_CRITERIA_NODE_HPP
#include "matador/query/criteria/abstract_criteria.hpp"
#include "matador/query/criteria/abstract_column_criteria.hpp"
#include "matador/query/criteria/criteria_utils.hpp"
#include "matador/sql/column.hpp"
@@ -16,19 +16,17 @@ enum class binary_operator {
LESS_THAN_OR_EQUAL,
};
class binary_criteria final : public abstract_criteria {
class binary_criteria final : public abstract_column_criteria {
public:
binary_criteria() = delete;
binary_criteria(sql::column column, binary_operator operand, criteria_value value);
void accept( criteria_visitor& visitor ) const override;
[[nodiscard]] const sql::column& column() const;
[[nodiscard]] binary_operator operand() const;
[[nodiscard]] const criteria_value& value() const;
private:
sql::column column_;
binary_operator operator_{};
criteria_value value_;
};
include/matador/query/criteria/collection_criteria.hpp
+3 -7
View File
@@ -1,7 +1,7 @@
#ifndef CRITERIA_COLLECTION_CRITERIA_NODE_HPP
#define CRITERIA_COLLECTION_CRITERIA_NODE_HPP
#include "matador/query/criteria/abstract_criteria.hpp"
#include "matador/query/criteria/abstract_column_criteria.hpp"
#include "matador/query/criteria/criteria_utils.hpp"
#include "matador/sql/column.hpp"
@@ -23,7 +23,7 @@ enum class collection_operator {
* WHERE age IN (29,34,56)
* @endcode
*/
class collection_criteria final : public abstract_criteria {
class collection_criteria final : public abstract_column_criteria {
public:
collection_criteria() = delete;
/**
@@ -41,29 +41,25 @@ public:
void accept(criteria_visitor& visitor) const override;
[[nodiscard]] const sql::column& column() const;
[[nodiscard]] collection_operator operand() const;
[[nodiscard]] const std::vector<criteria_value>& values() const;
private:
sql::column column_;
collection_operator operand_;
std::vector<criteria_value> values_;
};
class collection_query_criteria final : public abstract_criteria {
class collection_query_criteria final : public abstract_column_criteria {
public:
collection_query_criteria() = delete;
collection_query_criteria(sql::column col, collection_operator operand_, sql::query_context ctx);
void accept(criteria_visitor& visitor) const override;
[[nodiscard]] const sql::column& column() const;
[[nodiscard]] collection_operator operand() const;
[[nodiscard]] const sql::query_context& context() const;
private:
sql::column column_;
collection_operator operand_;
sql::query_context query_context_;
};
include/matador/query/criteria/criteria_operators.hpp
+7 -2
View File
@@ -19,8 +19,6 @@ criteria_ptr operator==(const sql::column &col, Type val) {
return std::make_unique<binary_criteria>(col, binary_operator::EQUALS, utils::value(val));
}
criteria_ptr operator==(const sql::column &col_left, const sql::column &col_right);
template<class Type>
criteria_ptr operator!=(const sql::column &col, Type val) {
return std::make_unique<binary_criteria>(col, binary_operator::NOT_EQUALS, utils::value(val));
@@ -46,6 +44,13 @@ criteria_ptr operator<=(const sql::column &col, Type val) {
return std::make_unique<binary_criteria>(col, binary_operator::LESS_THAN_OR_EQUAL, utils::value(val));
}
criteria_ptr operator==(const sql::column &col_left, const sql::column &col_right);
criteria_ptr operator!=(const sql::column &col_left, const sql::column &col_right);
criteria_ptr operator>(const sql::column &col_left, const sql::column &col_right);
criteria_ptr operator>=(const sql::column &col_left, const sql::column &col_right);
criteria_ptr operator<(const sql::column &col_left, const sql::column &col_right);
criteria_ptr operator<=(const sql::column &col_left, const sql::column &col_right);
criteria_ptr operator==(const sql::column &col, utils::placeholder p);
criteria_ptr operator!=(const sql::column &col, utils::placeholder p);
criteria_ptr operator>(const sql::column &col, utils::placeholder p);
include/matador/query/criteria/like_criteria.hpp
+2 -4
View File
@@ -1,23 +1,21 @@
#ifndef CRITERIA_LIKE_CRITERIA_NODE_HPP
#define CRITERIA_LIKE_CRITERIA_NODE_HPP
#include "matador/query/criteria/abstract_criteria.hpp"
#include "matador/query/criteria/abstract_column_criteria.hpp"
#include "matador/sql/column.hpp"
namespace matador::query {
class like_criteria final : public abstract_criteria {
class like_criteria final : public abstract_column_criteria {
public:
like_criteria() = delete;
like_criteria(sql::column column, std::string pattern);
void accept(criteria_visitor &visitor) const override;
[[nodiscard]] const sql::column& column() const;
[[nodiscard]] const std::string& pattern() const;
private:
sql::column column_;
std::string pattern_;
};
}
include/matador/query/criteria/logical_criteria.hpp
+2 -2
View File
@@ -21,9 +21,9 @@ public:
[[nodiscard]] const criteria_ptr& right_clause() const;
private:
std::unique_ptr<abstract_criteria> left_criteria_;
criteria_ptr left_criteria_;
logical_operator operand_;
std::unique_ptr<abstract_criteria> right_criteria_;
criteria_ptr right_criteria_;
};
}
#endif //CRITERIA_LOGICAL_CRITERIA_NODE_HPP
include/matador/sql/column.hpp
+3 -2
View File
@@ -31,11 +31,12 @@ struct column {
[[nodiscard]] const std::string& column_name() const;
[[nodiscard]] std::string full_name() const;
[[nodiscard]] const std::string& alias_name() const;
[[nodiscard]] bool is_function() const;
[[nodiscard]] bool has_alias() const;
[[nodiscard]] std::shared_ptr<sql::table> table() const;
std::shared_ptr<table> table_;
using table_ref = std::reference_wrapper<const table>;
std::shared_ptr<sql::table> table_;
std::string name;
std::string alias;
sql_function_t function_{sql_function_t::NONE};