From 399fa9a157f59d0c6c8207e08ee2922ad3390963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Sun, 12 Oct 2025 11:02:57 +0200 Subject: [PATCH] changed type of on_revision value parameter to uint64_t --- .../matador/object/join_columns_collector.hpp | 8 ++++---- include/matador/orm/session.hpp | 3 ++- .../matador/orm/session_insert_builder.hpp | 2 +- include/matador/orm/session_query_builder.hpp | 2 +- include/matador/query/fk_value_extractor.hpp | 2 +- include/matador/query/key_value_generator.hpp | 20 ++++++++----------- include/matador/sql/column_generator.hpp | 2 +- .../sql/internal/object_result_binder.hpp | 2 +- .../sql/internal/query_result_impl.hpp | 2 +- .../sql/internal/query_result_pk_resolver.hpp | 2 +- source/orm/orm/session_insert_builder.cpp | 2 +- source/orm/orm/session_query_builder.cpp | 2 +- source/orm/query/key_value_generator.cpp | 4 +++- source/orm/sql/column_generator.cpp | 2 +- 14 files changed, 27 insertions(+), 28 deletions(-) diff --git a/include/matador/object/join_columns_collector.hpp b/include/matador/object/join_columns_collector.hpp index c458718..c45fb6f 100644 --- a/include/matador/object/join_columns_collector.hpp +++ b/include/matador/object/join_columns_collector.hpp @@ -26,15 +26,15 @@ public: } template < class V > static void on_primary_key(const char * /*id*/, V &, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {} - static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {} + static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {} template static void on_attribute(const char * /*id*/, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) {} template - static 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 - static 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 - static 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 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; diff --git a/include/matador/orm/session.hpp b/include/matador/orm/session.hpp index 526e371..5639975 100644 --- a/include/matador/orm/session.hpp +++ b/include/matador/orm/session.hpp @@ -4,6 +4,7 @@ #include "matador/orm/error_code.hpp" #include "matador/orm/session_query_builder.hpp" +#include "matador/query/condition.hpp" #include "matador/query/query.hpp" #include "matador/sql/column_generator.hpp" @@ -58,7 +59,7 @@ public: template < class V > static void on_primary_key(const char * /*id*/, V &/*pk*/, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) {} - static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {} + static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {} template static void on_attribute(const char * /*id*/, Type &/*obj*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {} template diff --git a/include/matador/orm/session_insert_builder.hpp b/include/matador/orm/session_insert_builder.hpp index a573481..155855b 100644 --- a/include/matador/orm/session_insert_builder.hpp +++ b/include/matador/orm/session_insert_builder.hpp @@ -67,7 +67,7 @@ public: push(id, x); } - void on_revision(const char *id, unsigned long long &/*rev*/); + void on_revision(const char *id, uint64_t &/*rev*/); template void on_attribute(const char *id, Type &x, const utils::field_attributes &/*attr*/ = utils::null_attributes) { diff --git a/include/matador/orm/session_query_builder.hpp b/include/matador/orm/session_query_builder.hpp index ee508f4..77328b2 100644 --- a/include/matador/orm/session_query_builder.hpp +++ b/include/matador/orm/session_query_builder.hpp @@ -98,7 +98,7 @@ public: } } - void on_revision(const char *id, unsigned long long &/*rev*/); + void on_revision(const char *id, uint64_t &/*rev*/); template void on_attribute(const char *id, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) diff --git a/include/matador/query/fk_value_extractor.hpp b/include/matador/query/fk_value_extractor.hpp index 17dd907..7627bfc 100644 --- a/include/matador/query/fk_value_extractor.hpp +++ b/include/matador/query/fk_value_extractor.hpp @@ -25,7 +25,7 @@ public: void on_primary_key(const char *, ValueType &pk, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) { value_ = pk; } - static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {} + static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {} template < class Type > static void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {} static void on_attribute(const char * /*id*/, char * /*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {} diff --git a/include/matador/query/key_value_generator.hpp b/include/matador/query/key_value_generator.hpp index b3544a2..bf55e90 100644 --- a/include/matador/query/key_value_generator.hpp +++ b/include/matador/query/key_value_generator.hpp @@ -15,12 +15,11 @@ class key_value_generator { private: public: - explicit key_value_generator(std::vector &result) : result_(result) {} + explicit key_value_generator(std::vector &result); public: template < class Type > - static std::vector generate(const Type &obj) - { + static std::vector generate(const Type &obj) { std::vector result; key_value_generator generator(result); access::process(generator, obj); @@ -32,29 +31,26 @@ public: void on_primary_key(const char *id, V &x, const utils::primary_key_attribute& /*attr*/ = utils::default_pk_attributes) { result_.emplace_back(id, x); } - void on_revision(const char *id, unsigned long long &/*rev*/); + void on_revision(const char *id, uint64_t &/*rev*/); template - void on_attribute(const char *id, Type &x, const utils::field_attributes &/*attr*/ = utils::null_attributes) - { + void on_attribute(const char *id, Type &x, const utils::field_attributes &/*attr*/ = utils::null_attributes) { result_.emplace_back(id, x); } template class Pointer> - void on_belongs_to(const char *id, Pointer &x, const utils::foreign_attributes &/*attr*/) - { + void on_belongs_to(const char *id, Pointer &x, const utils::foreign_attributes &/*attr*/) { result_.emplace_back(id, fk_value_extractor_.extract(*x)); } template class Pointer> - void on_has_one(const char *id, Pointer &x, const utils::foreign_attributes &/*attr*/) - { + void on_has_one(const char *id, Pointer &x, const utils::foreign_attributes &/*attr*/) { result_.emplace_back(id, fk_value_extractor_.extract(*x)); } template - void on_has_many(const char *, ContainerType &, const char *, const char *, const utils::foreign_attributes &/*attr*/) {} + static void on_has_many(const char *, ContainerType &, const char *, const char *, const utils::foreign_attributes &/*attr*/) {} private: - detail::fk_value_extractor fk_value_extractor_; + detail::fk_value_extractor fk_value_extractor_{}; std::vector &result_; }; diff --git a/include/matador/sql/column_generator.hpp b/include/matador/sql/column_generator.hpp index 0740812..bc3b8c8 100644 --- a/include/matador/sql/column_generator.hpp +++ b/include/matador/sql/column_generator.hpp @@ -61,7 +61,7 @@ public: } push(id); } - void on_revision(const char *id, unsigned long long &/*rev*/); + void on_revision(const char *id, uint64_t &/*rev*/); template void on_attribute(const char *id, Type &, const utils::field_attributes &/*attr*/ = utils::null_attributes) { diff --git a/include/matador/sql/internal/object_result_binder.hpp b/include/matador/sql/internal/object_result_binder.hpp index 7e6b032..ce5613a 100644 --- a/include/matador/sql/internal/object_result_binder.hpp +++ b/include/matador/sql/internal/object_result_binder.hpp @@ -29,7 +29,7 @@ public: template void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr = utils::default_pk_attributes); - static void on_revision(const char * /*id*/, unsigned long long &/*rev*/) {} + static void on_revision(const char * /*id*/, uint64_t &/*rev*/) {} template < class Type > static void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) {} diff --git a/include/matador/sql/internal/query_result_impl.hpp b/include/matador/sql/internal/query_result_impl.hpp index a834ff7..a337f77 100644 --- a/include/matador/sql/internal/query_result_impl.hpp +++ b/include/matador/sql/internal/query_result_impl.hpp @@ -39,7 +39,7 @@ public: template void on_primary_key(const char *id, ValueType &value, const utils::primary_key_attribute& attr = utils::default_pk_attributes); - void on_revision(const char * /*id*/, unsigned long long &/*rev*/) { + void on_revision(const char * /*id*/, uint64_t &/*rev*/) { ++column_index_; } diff --git a/include/matador/sql/internal/query_result_pk_resolver.hpp b/include/matador/sql/internal/query_result_pk_resolver.hpp index d66a256..dd3a57a 100644 --- a/include/matador/sql/internal/query_result_pk_resolver.hpp +++ b/include/matador/sql/internal/query_result_pk_resolver.hpp @@ -36,7 +36,7 @@ public: utils::data_type_traits::read_value(reader_, id, column_index_++, value, attr.size()); pk_ = value; } - void on_revision(const char * /*id*/, unsigned long long &/*rev*/) { ++column_index_; } + void on_revision(const char * /*id*/, uint64_t &/*rev*/) { ++column_index_; } template < class Type > void on_attribute(const char * /*id*/, Type &/*x*/, const utils::field_attributes &/*attr*/ = utils::null_attributes) { ++column_index_; } diff --git a/source/orm/orm/session_insert_builder.cpp b/source/orm/orm/session_insert_builder.cpp index 20c4a07..29b78c6 100644 --- a/source/orm/orm/session_insert_builder.cpp +++ b/source/orm/orm/session_insert_builder.cpp @@ -1,7 +1,7 @@ #include "matador/orm/session_insert_builder.hpp" namespace matador::orm { -void session_insert_builder::on_revision(const char* id, unsigned long long& x) { +void session_insert_builder::on_revision(const char* id, uint64_t& x) { push(id, x); } diff --git a/source/orm/orm/session_query_builder.cpp b/source/orm/orm/session_query_builder.cpp index d09fe42..c5fc9f0 100644 --- a/source/orm/orm/session_query_builder.cpp +++ b/source/orm/orm/session_query_builder.cpp @@ -3,7 +3,7 @@ #include namespace matador::orm { -void session_query_builder::on_revision(const char *id, unsigned long long &/*rev*/) { +void session_query_builder::on_revision(const char *id, uint64_t &/*rev*/) { push(id); } diff --git a/source/orm/query/key_value_generator.cpp b/source/orm/query/key_value_generator.cpp index 345ed03..2fc59ac 100644 --- a/source/orm/query/key_value_generator.cpp +++ b/source/orm/query/key_value_generator.cpp @@ -3,8 +3,10 @@ #include "matador/query/value_extractor.hpp" namespace matador::query { +key_value_generator::key_value_generator(std::vector &result) +: result_(result) {} -void key_value_generator::on_revision(const char *id, unsigned long long int &x) { +void key_value_generator::on_revision(const char *id, uint64_t &x) { result_.emplace_back(id, x); } diff --git a/source/orm/sql/column_generator.cpp b/source/orm/sql/column_generator.cpp index b20f0e4..fa3da86 100644 --- a/source/orm/sql/column_generator.cpp +++ b/source/orm/sql/column_generator.cpp @@ -31,7 +31,7 @@ std::vector column_generator::generate( const object::repository& scm, c return columns; } -void column_generator::on_revision(const char *id, unsigned long long int &) +void column_generator::on_revision(const char *id, uint64_t &) { if (has_many_to_many_) { return;