From f30c250a203212866fcaee206f1b9a7a2a88816f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Wed, 7 Jan 2026 09:21:10 +0100 Subject: [PATCH] renamed blob to blob_type_t --- .../postgres/include/postgres_connection.hpp | 2 +- .../include/postgres_parameter_binder.h | 2 +- .../include/postgres_result_reader.hpp | 4 +-- backends/postgres/src/postgres_connection.cpp | 2 +- .../src/postgres_parameter_binder.cpp | 2 +- .../postgres/src/postgres_result_reader.cpp | 8 +++--- demo/work/admin/CollectionCenter.hpp | 2 +- demo/work/admin/Scenario.hpp | 2 +- demo/work/admin/User.hpp | 2 +- .../matador/query/attribute_string_writer.hpp | 2 +- .../internal/basic_type_to_string_visitor.hpp | 2 +- include/matador/query/value_extractor.hpp | 2 +- include/matador/sql/dialect.hpp | 6 ++--- .../matador/sql/interface/connection_impl.hpp | 4 +-- include/matador/utils/attribute_reader.hpp | 2 +- include/matador/utils/attribute_writer.hpp | 2 +- .../matador/utils/basic_type_converter.hpp | 2 +- include/matador/utils/convert.hpp | 26 +++++++++---------- include/matador/utils/default_type_traits.hpp | 6 ++--- include/matador/utils/string.hpp | 2 +- include/matador/utils/types.hpp | 4 +-- include/matador/utils/value.hpp | 2 +- source/core/utils/default_type_traits.cpp | 4 +-- source/core/utils/string.cpp | 2 +- source/core/utils/types.cpp | 2 +- source/core/utils/value.cpp | 2 +- source/orm/query/attribute_string_writer.cpp | 2 +- source/orm/query/value_extractor.cpp | 2 +- source/orm/sql/dialect.cpp | 2 +- test/backends/QueryBasicTest.cpp | 2 +- test/backends/QueryRecordTest.cpp | 4 +-- test/backends/QueryStatementTests.cpp | 6 ++--- test/core/utils/ConvertTest.cpp | 4 +-- test/core/utils/DefaultTypeTraitsTest.cpp | 2 +- test/models/person.hpp | 2 +- test/models/types.hpp | 2 +- test/orm/backend/test_connection.cpp | 2 +- test/orm/backend/test_connection.hpp | 2 +- test/orm/backend/test_parameter_binder.cpp | 2 +- test/orm/backend/test_parameter_binder.hpp | 2 +- test/orm/backend/test_result_reader.cpp | 12 ++++++--- test/orm/backend/test_result_reader.hpp | 14 +++++----- test/orm/query/QueryBuilderTest.cpp | 2 +- test/orm/sql/FieldTest.cpp | 6 ++--- 44 files changed, 88 insertions(+), 80 deletions(-) diff --git a/backends/postgres/include/postgres_connection.hpp b/backends/postgres/include/postgres_connection.hpp index 57c2f2b..bde2007 100644 --- a/backends/postgres/include/postgres_connection.hpp +++ b/backends/postgres/include/postgres_connection.hpp @@ -38,7 +38,7 @@ public: utils::result, utils::error> describe(const std::string& table) override; utils::result exists(const std::string &schema_name, const std::string &table_name) override; - [[nodiscard]] std::string to_escaped_string( const utils::blob& value ) const override; + [[nodiscard]] std::string to_escaped_string( const utils::blob_type_t& value ) const override; private: [[nodiscard]] static std::string generate_statement_name(const sql::query_context &query) ; diff --git a/backends/postgres/include/postgres_parameter_binder.h b/backends/postgres/include/postgres_parameter_binder.h index 917295a..1c3262c 100644 --- a/backends/postgres/include/postgres_parameter_binder.h +++ b/backends/postgres/include/postgres_parameter_binder.h @@ -38,7 +38,7 @@ public: void write_value(size_t pos, const char *x, size_t size) override; void write_value(size_t pos, const std::string &x) override; void write_value(size_t pos, const std::string &x, size_t size) override; - void write_value(size_t pos, const utils::blob &x) override; + void write_value(size_t pos, const utils::blob_type_t &x) override; void write_value(size_t pos, const utils::value &x, size_t size) override; [[nodiscard]] const bind_data& params() const; diff --git a/backends/postgres/include/postgres_result_reader.hpp b/backends/postgres/include/postgres_result_reader.hpp index 0ee6004..f6694f5 100644 --- a/backends/postgres/include/postgres_result_reader.hpp +++ b/backends/postgres/include/postgres_result_reader.hpp @@ -28,7 +28,7 @@ public: void read_value(const char *, size_t, char *, size_t) override {} void read_value(const char *, size_t, std::string &) override {} void read_value(const char *, size_t, std::string &, size_t) override {} - void read_value(const char *, size_t, utils::blob &) override {} + void read_value(const char *, size_t, utils::blob_type_t &) override {} void read_value(const char *, size_t, utils::value &, size_t) override {} }; @@ -62,7 +62,7 @@ public: void read_value(const char *id, size_t index, char *value, size_t size) override; void read_value(const char *id, size_t index, std::string &value) override; void read_value(const char *id, size_t index, std::string &value, size_t size) override; - void read_value(const char *id, size_t index, utils::blob &value) override; + void read_value(const char *id, size_t index, utils::blob_type_t &value) override; void read_value(const char *id, size_t index, utils::value &val, size_t size) override; protected: diff --git a/backends/postgres/src/postgres_connection.cpp b/backends/postgres/src/postgres_connection.cpp index 4f09cf9..879e170 100644 --- a/backends/postgres/src/postgres_connection.cpp +++ b/backends/postgres/src/postgres_connection.cpp @@ -293,7 +293,7 @@ utils::result postgres_connection::exists(const std::string return utils::ok(*result == 1); } -std::string postgres_connection::to_escaped_string(const utils::blob &value) const { +std::string postgres_connection::to_escaped_string(const utils::blob_type_t &value) const { size_t escapedDataLength; unsigned char *escapedData = PQescapeByteaConn(conn_, value.data(), value.size(), &escapedDataLength); diff --git a/backends/postgres/src/postgres_parameter_binder.cpp b/backends/postgres/src/postgres_parameter_binder.cpp index 8dd8a02..5951b1f 100644 --- a/backends/postgres/src/postgres_parameter_binder.cpp +++ b/backends/postgres/src/postgres_parameter_binder.cpp @@ -148,7 +148,7 @@ void postgres_parameter_binder::write_value(const size_t pos, const utils::time_ void postgres_parameter_binder::write_value(size_t pos, const utils::timestamp &x) { } -void postgres_parameter_binder::write_value(const size_t pos, const utils::blob &x) { +void postgres_parameter_binder::write_value(const size_t pos, const utils::blob_type_t &x) { bind_data_.bytes[pos] = x; bind_data_.values[pos] = reinterpret_cast(bind_data_.bytes[pos].data()); bind_data_.lengths[pos] = static_cast(bind_data_.bytes[pos].size()); diff --git a/backends/postgres/src/postgres_result_reader.cpp b/backends/postgres/src/postgres_result_reader.cpp index 5a0b43b..ff8c8c0 100644 --- a/backends/postgres/src/postgres_result_reader.cpp +++ b/backends/postgres/src/postgres_result_reader.cpp @@ -145,7 +145,7 @@ void postgres_result_reader::read_value(const char * /*id*/, const size_t index, value.assign(column(index)); } -void postgres_result_reader::read_value(const char * /*id*/, const size_t index, utils::blob &value) { +void postgres_result_reader::read_value(const char * /*id*/, const size_t index, utils::blob_type_t &value) { const auto *data = reinterpret_cast(column(index)); size_t length; @@ -164,11 +164,11 @@ void set_value(const char *str, utils::value &value) { } template<> -void set_value(const char *str, utils::value &value) { +void set_value(const char *str, utils::value &value) { size_t length; unsigned char *unescaped = PQunescapeBytea(reinterpret_cast(str), &length); - value = utils::blob(unescaped, unescaped + length); + value = utils::blob_type_t(unescaped, unescaped + length); PQfreemem(unescaped); } @@ -232,7 +232,7 @@ void postgres_result_reader::read_value(const char * /*id*/, const size_t index, break; } case utils::basic_type::Blob: { - set_value(column(index), val); + set_value(column(index), val); break; } case utils::basic_type::Unknown: diff --git a/demo/work/admin/CollectionCenter.hpp b/demo/work/admin/CollectionCenter.hpp index ae3e128..a432667 100644 --- a/demo/work/admin/CollectionCenter.hpp +++ b/demo/work/admin/CollectionCenter.hpp @@ -30,7 +30,7 @@ static const matador::utils::enum_mapper CollectionCenterT struct CollectionCenter : core::Model { std::string name; - matador::utils::blob symbol; + matador::utils::blob_type_t symbol; CollectionCenterType type{CollectionCenterType::NoType}; matador::object::collection> users; diff --git a/demo/work/admin/Scenario.hpp b/demo/work/admin/Scenario.hpp index 988b8a4..1e92abf 100644 --- a/demo/work/admin/Scenario.hpp +++ b/demo/work/admin/Scenario.hpp @@ -40,7 +40,7 @@ struct Scenario : core::Model { std::string name; ScenarioMode mode{ScenarioMode::InvalidMode}; std::string description; - matador::utils::blob symbol; + matador::utils::blob_type_t symbol; ScenarioState state{ScenarioState::InvalidState}; matador::object::collection> collection_center; diff --git a/demo/work/admin/User.hpp b/demo/work/admin/User.hpp index 244609d..da0d208 100644 --- a/demo/work/admin/User.hpp +++ b/demo/work/admin/User.hpp @@ -16,7 +16,7 @@ struct UserDirectory; struct User : core::Model { std::string name; - matador::utils::blob symbol; + matador::utils::blob_type_t symbol; std::string salt; std::string password; LockType lock_type{LockType::NoLock}; diff --git a/include/matador/query/attribute_string_writer.hpp b/include/matador/query/attribute_string_writer.hpp index 5030cbc..407f277 100644 --- a/include/matador/query/attribute_string_writer.hpp +++ b/include/matador/query/attribute_string_writer.hpp @@ -45,7 +45,7 @@ public: void write_value(size_t pos, const char* x, size_t size) override; void write_value(size_t pos, const std::string& x) override; void write_value(size_t pos, const std::string& x, size_t size) override; - void write_value(size_t pos, const utils::blob& x) override; + void write_value(size_t pos, const utils::blob_type_t& x) override; void write_value(size_t pos, const utils::value& x, size_t size) override; private: diff --git a/include/matador/query/internal/basic_type_to_string_visitor.hpp b/include/matador/query/internal/basic_type_to_string_visitor.hpp index 0ba4eee..0b39f13 100644 --- a/include/matador/query/internal/basic_type_to_string_visitor.hpp +++ b/include/matador/query/internal/basic_type_to_string_visitor.hpp @@ -34,7 +34,7 @@ struct basic_type_to_string_visitor void operator()(const utils::date_type_t &x) { result = writer->to_string(x); } void operator()(const utils::time_type_t &x) { result = writer->to_string(x); } void operator()(const utils::timestamp &x) { result = writer->to_string(x); } - void operator()(const utils::blob &x) { result = writer->to_string(x); } + void operator()(const utils::blob_type_t &x) { result = writer->to_string(x); } attribute_string_writer *writer{}; sql::query_context &query; diff --git a/include/matador/query/value_extractor.hpp b/include/matador/query/value_extractor.hpp index 15c44b8..b2b4243 100644 --- a/include/matador/query/value_extractor.hpp +++ b/include/matador/query/value_extractor.hpp @@ -78,7 +78,7 @@ public: void write_value(size_t pos, const char *x, size_t size) override; void write_value(size_t pos, const std::string &x) override; void write_value(size_t pos, const std::string &x, size_t size) override; - void write_value(size_t pos, const utils::blob &x) override; + void write_value(size_t pos, const utils::blob_type_t &x) override; void write_value(size_t pos, const utils::value &x, size_t size) override; private: diff --git a/include/matador/sql/dialect.hpp b/include/matador/sql/dialect.hpp index 5f0f16e..7f9ea8a 100644 --- a/include/matador/sql/dialect.hpp +++ b/include/matador/sql/dialect.hpp @@ -37,7 +37,7 @@ public: using sql_func_to_string_map = std::unordered_map; using next_placeholder_func = std::function; - using to_escaped_string_func = std::function; + using to_escaped_string_func = std::function; public: [[nodiscard]] const std::string& token_at(dialect_token token) const; @@ -115,7 +115,7 @@ public: */ [[nodiscard]] std::string next_placeholder(const std::vector &bind_vars) const; - [[nodiscard]] std::string to_escaped_string(const utils::blob &value, const connection_impl *conn = nullptr) const; + [[nodiscard]] std::string to_escaped_string(const utils::blob_type_t &value, const connection_impl *conn = nullptr) const; /** * Returns the default schema name. @@ -183,7 +183,7 @@ private: friend class dialect_builder; next_placeholder_func placeholder_func_ = [](size_t) { return "?"; }; - to_escaped_string_func to_escaped_string_func_ = [](const utils::blob &val) { return utils::to_string(val); }; + to_escaped_string_func to_escaped_string_func_ = [](const utils::blob_type_t &val) { return utils::to_string(val); }; escape_identifier_t identifier_escape_type_ = escape_identifier_t::ESCAPE_BOTH_SAME; diff --git a/include/matador/sql/interface/connection_impl.hpp b/include/matador/sql/interface/connection_impl.hpp index 7cf7e1d..159102f 100644 --- a/include/matador/sql/interface/connection_impl.hpp +++ b/include/matador/sql/interface/connection_impl.hpp @@ -13,7 +13,7 @@ #include "matador/utils/version.hpp" namespace matador::utils { -using blob = std::vector; +using blob_type_t = std::vector; } namespace matador::sql { @@ -43,7 +43,7 @@ public: [[nodiscard]] const class dialect &dialect() const; - [[nodiscard]] virtual std::string to_escaped_string(const utils::blob &value) const = 0; + [[nodiscard]] virtual std::string to_escaped_string(const utils::blob_type_t &value) const = 0; [[nodiscard]] const connection_info &info() const; protected: diff --git a/include/matador/utils/attribute_reader.hpp b/include/matador/utils/attribute_reader.hpp index 6f0ef94..0f611ad 100644 --- a/include/matador/utils/attribute_reader.hpp +++ b/include/matador/utils/attribute_reader.hpp @@ -31,7 +31,7 @@ public: virtual void read_value(const char *id, size_t index, char *value, size_t size) = 0; virtual void read_value(const char *id, size_t index, std::string &value) = 0; virtual void read_value(const char *id, size_t index, std::string &value, size_t size) = 0; - virtual void read_value(const char *id, size_t index, blob &value) = 0; + virtual void read_value(const char *id, size_t index, blob_type_t &value) = 0; virtual void read_value(const char *id, size_t index, value &value, size_t size) = 0; }; diff --git a/include/matador/utils/attribute_writer.hpp b/include/matador/utils/attribute_writer.hpp index ab83069..af2fef4 100644 --- a/include/matador/utils/attribute_writer.hpp +++ b/include/matador/utils/attribute_writer.hpp @@ -32,7 +32,7 @@ public: virtual void write_value(size_t pos, const char *x, size_t size) = 0; virtual void write_value(size_t pos, const std::string &x) = 0; virtual void write_value(size_t pos, const std::string &x, size_t size) = 0; - virtual void write_value(size_t pos, const blob &x) = 0; + virtual void write_value(size_t pos, const blob_type_t &x) = 0; virtual void write_value(size_t pos, const value &x, size_t size) = 0; }; diff --git a/include/matador/utils/basic_type_converter.hpp b/include/matador/utils/basic_type_converter.hpp index edf44c9..031b061 100644 --- a/include/matador/utils/basic_type_converter.hpp +++ b/include/matador/utils/basic_type_converter.hpp @@ -34,7 +34,7 @@ public: void operator()(date_type_t &x) { this->convert(x); } void operator()(time_type_t &x) { this->convert(x); } void operator()(timestamp &x) { this->convert(x); } - void operator()(blob &x) { this->convert(x); } + void operator()(blob_type_t &x) { this->convert(x); } private: result result_{}; diff --git a/include/matador/utils/convert.hpp b/include/matador/utils/convert.hpp index aa1db64..afffc94 100644 --- a/include/matador/utils/convert.hpp +++ b/include/matador/utils/convert.hpp @@ -158,7 +158,7 @@ result to(const std::string &source, std::enable_if_ } template < typename DestType > -result to(const blob &source, std::enable_if_t>* = nullptr) { +result to(const blob_type_t &source, std::enable_if_t>* = nullptr) { return ok(source); } @@ -211,7 +211,7 @@ result to(const SourceType &source, std::enable_if_t } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t &&std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t &&std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } @@ -224,12 +224,12 @@ result to(const SourceType &source, std::enable_if_t } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType, typename SourceType > -result to(const SourceType &source, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &source, std::enable_if_t && std::is_same_v>* = nullptr) { DestType result; result.resize(sizeof(source)); std::memcpy(result.data(), &source, sizeof(source)); @@ -238,17 +238,17 @@ result to(const SourceType &source, std::enable_if_t } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } @@ -353,17 +353,17 @@ result to(const SourceType &/*source*/, std::enable_ } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType, typename SourceType > -result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { +result to(const SourceType &/*source*/, std::enable_if_t && std::is_same_v>* = nullptr) { return failure(conversion_error::NotConvertable); } @@ -413,17 +413,17 @@ result to(const SourceType &/*source*/, std::enable_ } template < typename DestType> -result to(const blob &/*source*/, std::enable_if_t>* = nullptr) { +result to(const blob_type_t &/*source*/, std::enable_if_t>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType> -result to(const blob &/*source*/, std::enable_if_t>* = nullptr) { +result to(const blob_type_t &/*source*/, std::enable_if_t>* = nullptr) { return failure(conversion_error::NotConvertable); } template < typename DestType> -result to(const blob &/*source*/, std::enable_if_t>* = nullptr) { +result to(const blob_type_t &/*source*/, std::enable_if_t>* = nullptr) { return failure(conversion_error::NotConvertable); } diff --git a/include/matador/utils/default_type_traits.hpp b/include/matador/utils/default_type_traits.hpp index b16f19d..bebaff8 100644 --- a/include/matador/utils/default_type_traits.hpp +++ b/include/matador/utils/default_type_traits.hpp @@ -131,10 +131,10 @@ struct data_type_traits { }; template<> -struct data_type_traits { +struct data_type_traits { static basic_type type(std::size_t /*size*/) { return basic_type::Blob; } - static void read_value(attribute_reader &reader, const char *id, size_t index, utils::blob &value, size_t /*size*/ = 0); - static void bind_value(attribute_writer &binder, size_t index, utils::blob &value, size_t /*size*/ = 0); + static void read_value(attribute_reader &reader, const char *id, size_t index, utils::blob_type_t &value, size_t /*size*/ = 0); + static void bind_value(attribute_writer &binder, size_t index, utils::blob_type_t &value, size_t /*size*/ = 0); }; template<> diff --git a/include/matador/utils/string.hpp b/include/matador/utils/string.hpp index 5f18ace..95795f8 100644 --- a/include/matador/utils/string.hpp +++ b/include/matador/utils/string.hpp @@ -18,7 +18,7 @@ namespace matador::utils { * @param data Binary data to be converted * @return Binary data as string */ -MATADOR_UTILS_API std::string to_string(const blob &data); +MATADOR_UTILS_API std::string to_string(const blob_type_t &data); MATADOR_UTILS_API std::string to_string(const date_type_t &data); MATADOR_UTILS_API std::string to_string(const time_type_t &data); diff --git a/include/matador/utils/types.hpp b/include/matador/utils/types.hpp index 8ec8468..7c74889 100644 --- a/include/matador/utils/types.hpp +++ b/include/matador/utils/types.hpp @@ -12,7 +12,7 @@ namespace matador::utils { enum class basic_type : uint8_t; using byte = unsigned char; -using blob = std::vector; +using blob_type_t = std::vector; using timestamp = std::chrono::system_clock::time_point; struct date_type_t; @@ -25,7 +25,7 @@ using database_type = std::variant< bool, const char*, std::string, - blob, + blob_type_t, timestamp, date_type_t, time_type_t, diff --git a/include/matador/utils/value.hpp b/include/matador/utils/value.hpp index 294d20e..b21d6ee 100644 --- a/include/matador/utils/value.hpp +++ b/include/matador/utils/value.hpp @@ -14,7 +14,7 @@ template size_t determine_size(const Type &/*val*/) { return 0; } size_t determine_size(const std::string &val); size_t determine_size(const char *val); -size_t determine_size(const blob &val); +size_t determine_size(const blob_type_t &val); } diff --git a/source/core/utils/default_type_traits.cpp b/source/core/utils/default_type_traits.cpp index 815cfb7..6dd5df1 100644 --- a/source/core/utils/default_type_traits.cpp +++ b/source/core/utils/default_type_traits.cpp @@ -123,11 +123,11 @@ void data_type_traits::bind_value(attribute_writer &binder, const s binder.write_value(index, value, size); } -void data_type_traits::read_value(attribute_reader &reader, const char *id, const size_t index, utils::blob &value, const size_t /*size*/) { +void data_type_traits::read_value(attribute_reader &reader, const char *id, const size_t index, utils::blob_type_t &value, const size_t /*size*/) { reader.read_value(id, index, value); } -void data_type_traits::bind_value(attribute_writer &binder, const size_t index, blob &value, const size_t /*size*/) { +void data_type_traits::bind_value(attribute_writer &binder, const size_t index, blob_type_t &value, const size_t /*size*/) { binder.write_value(index, value); } diff --git a/source/core/utils/string.cpp b/source/core/utils/string.cpp index 8f62474..80ec6e6 100644 --- a/source/core/utils/string.cpp +++ b/source/core/utils/string.cpp @@ -4,7 +4,7 @@ #include namespace matador::utils { -std::string to_string(const blob& data) { +std::string to_string(const blob_type_t& data) { static constexpr char HEXITS[] = "0123456789ABCDEF"; std::string str(2 * data.size(), '\0'); diff --git a/source/core/utils/types.cpp b/source/core/utils/types.cpp index 063eb60..cce19fc 100644 --- a/source/core/utils/types.cpp +++ b/source/core/utils/types.cpp @@ -99,7 +99,7 @@ void initialize_by_basic_type(const basic_type type, database_type &val) { val.emplace(); break; case basic_type::Blob: - val.emplace(); + val.emplace(); break; default: val.emplace(); diff --git a/source/core/utils/value.cpp b/source/core/utils/value.cpp index 0b2706d..268c4a8 100644 --- a/source/core/utils/value.cpp +++ b/source/core/utils/value.cpp @@ -12,7 +12,7 @@ size_t determine_size(const char *val) { return strlen(val); } -size_t determine_size(const blob &val) { +size_t determine_size(const blob_type_t &val) { return val.size(); } } diff --git a/source/orm/query/attribute_string_writer.cpp b/source/orm/query/attribute_string_writer.cpp index 28fbe1e..369f557 100644 --- a/source/orm/query/attribute_string_writer.cpp +++ b/source/orm/query/attribute_string_writer.cpp @@ -96,7 +96,7 @@ void attribute_string_writer::write_value(size_t /*pos*/, const std::string &x, result_ = "'" + dialect_.prepare_literal(x) + "'"; } -void attribute_string_writer::write_value(size_t /*pos*/, const utils::blob &x) { +void attribute_string_writer::write_value(size_t /*pos*/, const utils::blob_type_t &x) { // "This is a binary Data string" as binary data: // MySQL: X'5468697320697320612062616E617279204461746120737472696E67' // Postgres: '\\x5468697320697320612062616E617279204461746120737472696E67' diff --git a/source/orm/query/value_extractor.cpp b/source/orm/query/value_extractor.cpp index 23322ff..e2df7f1 100644 --- a/source/orm/query/value_extractor.cpp +++ b/source/orm/query/value_extractor.cpp @@ -89,7 +89,7 @@ void value_extractor::write_value(size_t /*pos*/, const std::string &x, size_t / values_.emplace_back(x); } -void value_extractor::write_value(size_t /*pos*/, const utils::blob &x) { +void value_extractor::write_value(size_t /*pos*/, const utils::blob_type_t &x) { values_.emplace_back(x); } diff --git a/source/orm/sql/dialect.cpp b/source/orm/sql/dialect.cpp index 8f25d66..8477457 100644 --- a/source/orm/sql/dialect.cpp +++ b/source/orm/sql/dialect.cpp @@ -97,7 +97,7 @@ std::string dialect::next_placeholder(const std::vector &bind_vars) return placeholder_func_(bind_vars.size()); } -std::string dialect::to_escaped_string(const utils::blob &value, const connection_impl *conn) const { +std::string dialect::to_escaped_string(const utils::blob_type_t &value, const connection_impl *conn) const { if (conn != nullptr) { return conn->to_escaped_string(value); } diff --git a/test/backends/QueryBasicTest.cpp b/test/backends/QueryBasicTest.cpp index adee50f..fa2e1d0 100644 --- a/test/backends/QueryBasicTest.cpp +++ b/test/backends/QueryBasicTest.cpp @@ -60,7 +60,7 @@ TEST_CASE_METHOD(QueryFixture, "Insert and select basic datatypes", "[query][dat "gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."; // matador::date date_val(15, 3, 2015); // auto time_val = matador::time(2015, 3, 15, 13, 56, 23, 123); - matador::utils::blob blob_val {1,2,3,4,5,6,7,8}; + matador::utils::blob_type_t blob_val {1,2,3,4,5,6,7,8}; types t { 1, diff --git a/test/backends/QueryRecordTest.cpp b/test/backends/QueryRecordTest.cpp index e75fd4a..6c4e5b9 100644 --- a/test/backends/QueryRecordTest.cpp +++ b/test/backends/QueryRecordTest.cpp @@ -88,7 +88,7 @@ TEST_CASE_METHOD(QueryFixture, "Test all data types for record", "[query][record std::string varchar{"good day"}; date_type_t md{2025, 11, 27}; time_type_t mt{12, 34, 56}; - blob bin{0x01,0x02,0x03,0x04}; + blob_type_t bin{0x01,0x02,0x03,0x04}; res = query::insert() .into("types", cols) @@ -122,7 +122,7 @@ TEST_CASE_METHOD(QueryFixture, "Test all data types for record", "[query][record REQUIRE(md == row.at("val_date")); const auto mtres = row.at("val_time"); REQUIRE(mt == row.at("val_time")); - REQUIRE(bin == row.at("val_blob")); + REQUIRE(bin == row.at("val_blob")); } TEST_CASE_METHOD(QueryFixture, "Create and drop table statement", "[query][record]") diff --git a/test/backends/QueryStatementTests.cpp b/test/backends/QueryStatementTests.cpp index c6b74cd..6ebdf23 100644 --- a/test/backends/QueryStatementTests.cpp +++ b/test/backends/QueryStatementTests.cpp @@ -84,7 +84,7 @@ TEST_CASE_METHOD(QueryFixture, "Test insert statement", "[query][statement][inse REQUIRE((*row)->id == 1); REQUIRE((*row)->name == "george"); REQUIRE((*row)->age == 45); - REQUIRE((*row)->image == matador::utils::blob{1,2,3,4}); + REQUIRE((*row)->image == matador::utils::blob_type_t{1,2,3,4}); } TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][update]") { @@ -129,7 +129,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda REQUIRE((*row)->id == 1); REQUIRE((*row)->name == "george"); REQUIRE((*row)->age == 45); - REQUIRE((*row)->image == blob{1,2,3,4}); + REQUIRE((*row)->image == blob_type_t{1,2,3,4}); george.age = 36; george.image = {5,6,7,8}; @@ -154,7 +154,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda REQUIRE((*row)->id == 1); REQUIRE((*row)->name == "george"); REQUIRE((*row)->age == 36); - REQUIRE((*row)->image == blob{5,6,7,8}); + REQUIRE((*row)->image == blob_type_t{5,6,7,8}); } TEST_CASE_METHOD(QueryFixture, "Test delete statement", "[query][statement][delete]") { diff --git a/test/core/utils/ConvertTest.cpp b/test/core/utils/ConvertTest.cpp index 9883be6..00bae04 100644 --- a/test/core/utils/ConvertTest.cpp +++ b/test/core/utils/ConvertTest.cpp @@ -118,8 +118,8 @@ TEST_CASE("Test string to floating point conversion", "[convert][string][floatin } TEST_CASE("Test blob to blob conversion", "[convert][blob]") { - blob from{1, 2, 3, 4}; - const auto res = to(from); + blob_type_t from{1, 2, 3, 4}; + const auto res = to(from); REQUIRE(res.is_ok()); REQUIRE(from == *res); diff --git a/test/core/utils/DefaultTypeTraitsTest.cpp b/test/core/utils/DefaultTypeTraitsTest.cpp index be822a3..514288c 100644 --- a/test/core/utils/DefaultTypeTraitsTest.cpp +++ b/test/core/utils/DefaultTypeTraitsTest.cpp @@ -24,5 +24,5 @@ TEST_CASE("Test default data types", "[data_types][type]") { REQUIRE(data_type_traits::type(0) == basic_type::Text); REQUIRE(data_type_traits::type(32) == basic_type::Varchar); REQUIRE(data_type_traits::type(0) == basic_type::Text); - REQUIRE(data_type_traits::type(0) == basic_type::Blob); + REQUIRE(data_type_traits::type(0) == basic_type::Blob); } \ No newline at end of file diff --git a/test/models/person.hpp b/test/models/person.hpp index 1342686..66dc518 100644 --- a/test/models/person.hpp +++ b/test/models/person.hpp @@ -13,7 +13,7 @@ struct person { unsigned int id{}; std::string name; unsigned int age{}; - utils::blob image{}; + utils::blob_type_t image{}; template void process(Operator &op) { diff --git a/test/models/types.hpp b/test/models/types.hpp index 73ecf05..e9f35dd 100644 --- a/test/models/types.hpp +++ b/test/models/types.hpp @@ -27,7 +27,7 @@ struct types std::string varchar_ = "Erde"; // matador::date date_; // matador::time time_; - utils::blob binary_{ 1, 2, 3, 4 }; + utils::blob_type_t binary_{ 1, 2, 3, 4 }; template < class Operator > void process(Operator &op) diff --git a/test/orm/backend/test_connection.cpp b/test/orm/backend/test_connection.cpp index c0877e9..636a693 100644 --- a/test/orm/backend/test_connection.cpp +++ b/test/orm/backend/test_connection.cpp @@ -65,7 +65,7 @@ utils::result test_connection::exists(const std::string &/*s return utils::ok(false); } -std::string test_connection::to_escaped_string(const utils::blob& value) const { +std::string test_connection::to_escaped_string(const utils::blob_type_t& value) const { return utils::to_string(value); } diff --git a/test/orm/backend/test_connection.hpp b/test/orm/backend/test_connection.hpp index 70a640c..9d83516 100644 --- a/test/orm/backend/test_connection.hpp +++ b/test/orm/backend/test_connection.hpp @@ -22,7 +22,7 @@ public: utils::result, utils::error> describe(const std::string &table) override; utils::result exists(const std::string &schema_name, const std::string &table_name) override; - [[nodiscard]] std::string to_escaped_string( const utils::blob& value ) const override; + [[nodiscard]] std::string to_escaped_string( const utils::blob_type_t& value ) const override; private: bool is_open_{false}; diff --git a/test/orm/backend/test_parameter_binder.cpp b/test/orm/backend/test_parameter_binder.cpp index 2c3c133..d2b769a 100644 --- a/test/orm/backend/test_parameter_binder.cpp +++ b/test/orm/backend/test_parameter_binder.cpp @@ -19,6 +19,6 @@ void test_parameter_binder::write_value(size_t /*pos*/, const char * /*x*/) {} void test_parameter_binder::write_value(size_t /*pos*/, const char * /*x*/, size_t /*size*/) {} void test_parameter_binder::write_value(size_t /*pos*/, const std::string &/*x*/) {} void test_parameter_binder::write_value(size_t /*pos*/, const std::string &/*x*/, size_t /*size*/) {} -void test_parameter_binder::write_value(size_t /*pos*/, const utils::blob &/*x*/) {} +void test_parameter_binder::write_value(size_t /*pos*/, const utils::blob_type_t &/*x*/) {} void test_parameter_binder::write_value(size_t /*pos*/, const utils::value &/*x*/, size_t /*size*/) {} } diff --git a/test/orm/backend/test_parameter_binder.hpp b/test/orm/backend/test_parameter_binder.hpp index f3aad26..d94f6f0 100644 --- a/test/orm/backend/test_parameter_binder.hpp +++ b/test/orm/backend/test_parameter_binder.hpp @@ -25,7 +25,7 @@ public: void write_value(size_t pos, const char *x, size_t size) override; void write_value(size_t pos, const std::string &x) override; void write_value(size_t pos, const std::string &x, size_t size) override; - void write_value(size_t pos, const utils::blob &x) override; + void write_value(size_t pos, const utils::blob_type_t &x) override; void write_value(size_t pos, const utils::value &x, size_t size) override; }; diff --git a/test/orm/backend/test_result_reader.cpp b/test/orm/backend/test_result_reader.cpp index 77e3cc3..7c0a0dd 100644 --- a/test/orm/backend/test_result_reader.cpp +++ b/test/orm/backend/test_result_reader.cpp @@ -64,10 +64,16 @@ void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, value = 2.14159265358979323846; } -void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, matador::time &/*value*/) { +void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, utils::date_type_t &value) { + value = {2021, 10, 27}; } -void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, matador::date &/*value*/) { +void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, utils::time_type_t &value) { + value = {12, 34, 56, 123456}; +} + +void test_result_reader::read_value(const char *id, size_t index, utils::timestamp &value) { + value = utils::timestamp(); } void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, char * /*value*/, const size_t /*size*/) { @@ -81,7 +87,7 @@ void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, value = "Hello world"; } -void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, utils::blob &value) { +void test_result_reader::read_value(const char * /*id*/, const size_t /*index*/, utils::blob_type_t &value) { value = {'b', 'l', 'o', 'b'}; } diff --git a/test/orm/backend/test_result_reader.hpp b/test/orm/backend/test_result_reader.hpp index c52b30b..8fb3abb 100644 --- a/test/orm/backend/test_result_reader.hpp +++ b/test/orm/backend/test_result_reader.hpp @@ -21,12 +21,13 @@ public: void read_value(const char *, size_t, bool &) override {} void read_value(const char *, size_t, float &) override {} void read_value(const char *, size_t, double &) override {} - void read_value(const char *, size_t, time &) override {} - void read_value(const char *, size_t, date &) override {} + void read_value(const char *, size_t, utils::date_type_t &) override {} + void read_value(const char *, size_t, utils::time_type_t &) override {} + void read_value(const char *, size_t, utils::timestamp &) override {} void read_value(const char *, size_t, char *, size_t) override {} void read_value(const char *, size_t, std::string &) override {} void read_value(const char *, size_t, std::string &, size_t) override {} - void read_value(const char *, size_t, utils::blob &) override {} + void read_value(const char *, size_t, utils::blob_type_t &) override {} void read_value(const char *, size_t, utils::value &, size_t) override {} }; @@ -51,12 +52,13 @@ public: void read_value(const char *id, size_t index, bool &value) override; void read_value(const char *id, size_t index, float &value) override; void read_value(const char *id, size_t index, double &value) override; - void read_value(const char *id, size_t index, matador::time &value) override; - void read_value(const char *id, size_t index, matador::date &value) override; + void read_value(const char *id, size_t index, utils::date_type_t &value) override; + void read_value(const char *id, size_t index, utils::time_type_t &value) override; + void read_value(const char *id, size_t index, utils::timestamp &value) override; void read_value(const char *id, size_t index, char *value, size_t size) override; void read_value(const char *id, size_t index, std::string &value) override; void read_value(const char *id, size_t index, std::string &value, size_t size) override; - void read_value(const char *id, size_t index, utils::blob &value) override; + void read_value(const char *id, size_t index, utils::blob_type_t &value) override; void read_value(const char *id, size_t index, utils::value &val, size_t size) override; protected: diff --git a/test/orm/query/QueryBuilderTest.cpp b/test/orm/query/QueryBuilderTest.cpp index b27aa87..ac60f62 100644 --- a/test/orm/query/QueryBuilderTest.cpp +++ b/test/orm/query/QueryBuilderTest.cpp @@ -234,7 +234,7 @@ TEST_CASE_METHOD(QueryFixture, "Test create, insert and select a blob column", " result = query::insert() .into("person", {"id", "name", "data"}) - .values({7U, "george", blob{1, 'A', 3, 4}}) + .values({7U, "george", blob_type_t{1, 'A', 3, 4}}) .str(*db); REQUIRE(result == R"(INSERT INTO "person" ("id", "name", "data") VALUES (7, 'george', X'01410304'))"); diff --git a/test/orm/sql/FieldTest.cpp b/test/orm/sql/FieldTest.cpp index eb55b23..8ccb9fb 100644 --- a/test/orm/sql/FieldTest.cpp +++ b/test/orm/sql/FieldTest.cpp @@ -37,7 +37,7 @@ TEST_CASE("Test field", "[field]") { REQUIRE(bool_val.has_value()); REQUIRE(bool_val.value()); - f = sql::field("name", utils::blob{ 7,8,6,5,4,3 }, utils::constraints::None, 0, 1); + f = sql::field("name", utils::blob_type_t{ 7,8,6,5,4,3 }, utils::constraints::None, 0, 1); REQUIRE(f.index() == 1); REQUIRE(!f.is_null()); REQUIRE(!f.is_integer()); @@ -46,9 +46,9 @@ TEST_CASE("Test field", "[field]") { REQUIRE(!f.is_bool()); REQUIRE(!f.is_string()); - auto blob_val = f.as(); + auto blob_val = f.as(); REQUIRE(blob_val.has_value()); - REQUIRE(blob_val.value() == utils::blob{ 7,8,6,5,4,3 }); + REQUIRE(blob_val.value() == utils::blob_type_t{ 7,8,6,5,4,3 }); REQUIRE(!f.as().has_value()); } \ No newline at end of file