From bd06034ebf7226b6fcdc051f8ed5c2b3704dc3d9 Mon Sep 17 00:00:00 2001 From: sascha Date: Fri, 29 May 2026 15:09:11 +0200 Subject: [PATCH] renamed binary_operator to be pascal case --- .../query/criteria/binary_criteria.hpp | 12 ++++---- .../query/criteria/criteria_operators.hpp | 12 ++++---- .../orm/query/criteria/criteria_operators.cpp | 28 +++++++++---------- source/orm/query/criteria_evaluator.cpp | 12 ++++---- source/orm/query/select_query_builder.cpp | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/matador/query/criteria/binary_criteria.hpp b/include/matador/query/criteria/binary_criteria.hpp index 4fe28ea..4ee580a 100644 --- a/include/matador/query/criteria/binary_criteria.hpp +++ b/include/matador/query/criteria/binary_criteria.hpp @@ -8,12 +8,12 @@ namespace matador::query { enum class binary_operator { - EQUALS, - NOT_EQUALS, - GREATER_THAN, - GREATER_THAN_OR_EQUAL, - LESS_THAN, - LESS_THAN_OR_EQUAL, + Equals, + NotEquals, + GreaterThan, + GreaterThanOrEqual, + LessThan, + LessThanOrEqual, }; class binary_criteria final : public abstract_column_criteria { diff --git a/include/matador/query/criteria/criteria_operators.hpp b/include/matador/query/criteria/criteria_operators.hpp index 9da0479..8075e0c 100644 --- a/include/matador/query/criteria/criteria_operators.hpp +++ b/include/matador/query/criteria/criteria_operators.hpp @@ -20,33 +20,33 @@ class table_column; template std::enable_if_t>, criteria_ptr> operator==(const table_column &col, Type val) { - return std::make_unique(col, binary_operator::EQUALS, utils::value(val)); + return std::make_unique(col, binary_operator::Equals, utils::value(val)); } template std::enable_if_t>, criteria_ptr> operator!=(const table_column &col, Type val) { - return std::make_unique(col, binary_operator::NOT_EQUALS, utils::value(val)); + return std::make_unique(col, binary_operator::NotEquals, utils::value(val)); } template criteria_ptr operator>(const table_column &col, Type val) { - return std::make_unique(col, binary_operator::GREATER_THAN, utils::value(val)); + return std::make_unique(col, binary_operator::GreaterThan, utils::value(val)); } template criteria_ptr operator>=(const table_column &col, Type val) { - return std::make_unique(col, binary_operator::GREATER_THAN_OR_EQUAL, utils::value(val)); + return std::make_unique(col, binary_operator::GreaterThanOrEqual, utils::value(val)); } template criteria_ptr operator<(const table_column &col, Type val) { - return std::make_unique(col, binary_operator::LESS_THAN, utils::value(val)); + return std::make_unique(col, binary_operator::LessThan, utils::value(val)); } template criteria_ptr operator<=(const table_column &col, Type val) { - return std::make_unique(col, binary_operator::LESS_THAN_OR_EQUAL, utils::value(val)); + return std::make_unique(col, binary_operator::LessThanOrEqual, utils::value(val)); } criteria_ptr operator==(const table_column &col_left, const table_column &col_right); diff --git a/source/orm/query/criteria/criteria_operators.cpp b/source/orm/query/criteria/criteria_operators.cpp index 24e9c4f..76b1f60 100644 --- a/source/orm/query/criteria/criteria_operators.cpp +++ b/source/orm/query/criteria/criteria_operators.cpp @@ -13,61 +13,61 @@ namespace matador::query { criteria_ptr operator==(const table_column &col, const utils::identifier &id) { utils::identifier_to_value_converter conv; - return std::make_unique(col, binary_operator::EQUALS, conv.convert(id)); + return std::make_unique(col, binary_operator::Equals, conv.convert(id)); } criteria_ptr operator!=(const table_column &col, const utils::identifier &id) { utils::identifier_to_value_converter conv; - return std::make_unique(col, binary_operator::NOT_EQUALS, conv.convert(id)); + return std::make_unique(col, binary_operator::NotEquals, conv.convert(id)); } criteria_ptr operator==(const table_column &col, utils::placeholder p) { - return std::make_unique(col, binary_operator::EQUALS, p); + return std::make_unique(col, binary_operator::Equals, p); } criteria_ptr operator!=(const table_column &col, utils::placeholder p) { - return std::make_unique(col, binary_operator::NOT_EQUALS, p); + return std::make_unique(col, binary_operator::NotEquals, p); } criteria_ptr operator>(const table_column &col, utils::placeholder p) { - return std::make_unique(col, binary_operator::GREATER_THAN, p); + return std::make_unique(col, binary_operator::GreaterThan, p); } criteria_ptr operator>=(const table_column &col, utils::placeholder p) { - return std::make_unique(col, binary_operator::GREATER_THAN_OR_EQUAL, p); + return std::make_unique(col, binary_operator::GreaterThanOrEqual, p); } criteria_ptr operator<(const table_column &col, utils::placeholder p) { - return std::make_unique(col, binary_operator::LESS_THAN, p); + return std::make_unique(col, binary_operator::LessThan, p); } criteria_ptr operator<=(const table_column &col, utils::placeholder p) { - return std::make_unique(col, binary_operator::LESS_THAN_OR_EQUAL, p); + return std::make_unique(col, binary_operator::LessThanOrEqual, p); } criteria_ptr operator==( const table_column& col_left, const table_column& col_right ) { - return std::make_unique(col_left, binary_operator::EQUALS, col_right); + return std::make_unique(col_left, binary_operator::Equals, col_right); } criteria_ptr operator!=( const table_column& col_left, const table_column& col_right ) { - return std::make_unique(col_left, binary_operator::NOT_EQUALS, col_right); + return std::make_unique(col_left, binary_operator::NotEquals, col_right); } criteria_ptr operator>( const table_column& col_left, const table_column& col_right ) { - return std::make_unique(col_left, binary_operator::GREATER_THAN, col_right); + return std::make_unique(col_left, binary_operator::GreaterThan, col_right); } criteria_ptr operator>=( const table_column& col_left, const table_column& col_right ) { - return std::make_unique(col_left, binary_operator::GREATER_THAN_OR_EQUAL, col_right); + return std::make_unique(col_left, binary_operator::GreaterThanOrEqual, col_right); } criteria_ptr operator<( const table_column& col_left, const table_column& col_right ) { - return std::make_unique(col_left, binary_operator::LESS_THAN, col_right); + return std::make_unique(col_left, binary_operator::LessThan, col_right); } criteria_ptr operator<=( const table_column& col_left, const table_column& col_right ) { - return std::make_unique(col_left, binary_operator::LESS_THAN_OR_EQUAL, col_right); + return std::make_unique(col_left, binary_operator::LessThanOrEqual, col_right); } criteria_ptr operator&&(criteria_ptr left, criteria_ptr right) { diff --git a/source/orm/query/criteria_evaluator.cpp b/source/orm/query/criteria_evaluator.cpp index 70fde2c..808d024 100644 --- a/source/orm/query/criteria_evaluator.cpp +++ b/source/orm/query/criteria_evaluator.cpp @@ -18,12 +18,12 @@ namespace matador::query { namespace detail { static const utils::enum_mapper BinaryOperatorEnum({ - {binary_operator::EQUALS, "="}, - {binary_operator::NOT_EQUALS, "<>"}, - {binary_operator::GREATER_THAN, ">"}, - {binary_operator::GREATER_THAN_OR_EQUAL, ">="}, - {binary_operator::LESS_THAN, "<"}, - {binary_operator::LESS_THAN_OR_EQUAL, "<="}, + {binary_operator::Equals, "="}, + {binary_operator::NotEquals, "<>"}, + {binary_operator::GreaterThan, ">"}, + {binary_operator::GreaterThanOrEqual, ">="}, + {binary_operator::LessThan, "<"}, + {binary_operator::LessThanOrEqual, "<="}, }); } diff --git a/source/orm/query/select_query_builder.cpp b/source/orm/query/select_query_builder.cpp index d00e546..0f175de 100644 --- a/source/orm/query/select_query_builder.cpp +++ b/source/orm/query/select_query_builder.cpp @@ -83,7 +83,7 @@ void select_query_builder::append_join(const table_column &left, const table_col using namespace matador::query; entity_query_data_.joins.push_back({ right.table(), - std::make_unique(left, binary_operator::EQUALS, right) + std::make_unique(left, binary_operator::Equals, right) }); } }