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/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