From 6a4111ba3d47b98f2fff97a34239dc2202765144 Mon Sep 17 00:00:00 2001 From: Sascha Kuehl Date: Mon, 27 Nov 2023 17:25:46 +0100 Subject: [PATCH] moved redundant read value code into query_result_reader --- .../include/postgres_result_reader.hpp | 17 --- .../postgres/src/postgres_result_reader.cpp | 102 ------------------ .../sqlite/include/sqlite_result_reader.hpp | 19 +--- backends/sqlite/src/sqlite_result_reader.cpp | 95 ---------------- include/matador/sql/query_result_reader.hpp | 36 +++---- src/sql/query_result_reader.cpp | 95 ++++++++++++++++ 6 files changed, 114 insertions(+), 250 deletions(-) diff --git a/backends/postgres/include/postgres_result_reader.hpp b/backends/postgres/include/postgres_result_reader.hpp index 63db4d7..84f7e0b 100644 --- a/backends/postgres/include/postgres_result_reader.hpp +++ b/backends/postgres/include/postgres_result_reader.hpp @@ -16,23 +16,6 @@ public: [[nodiscard]] const char *column(size_t index) const override; bool fetch() override; - void read_value(const char *id, size_t index, char &value) override; - void read_value(const char *id, size_t index, short &value) override; - void read_value(const char *id, size_t index, int &value) override; - void read_value(const char *id, size_t index, long &value) override; - void read_value(const char *id, size_t index, long long int &value) override; - void read_value(const char *id, size_t index, unsigned char &value) override; - void read_value(const char *id, size_t index, unsigned short &value) override; - void read_value(const char *id, size_t index, unsigned int &value) override; - void read_value(const char *id, size_t index, unsigned long &value) override; - void read_value(const char *id, size_t index, unsigned long long int &value) override; - 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, char *value, size_t s) 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 s) override; - private: PGresult *result_{}; diff --git a/backends/postgres/src/postgres_result_reader.cpp b/backends/postgres/src/postgres_result_reader.cpp index 5719263..767f60c 100644 --- a/backends/postgres/src/postgres_result_reader.cpp +++ b/backends/postgres/src/postgres_result_reader.cpp @@ -32,106 +32,4 @@ bool postgres_result_reader::fetch() return ++row_index_ < row_count_; } -void postgres_result_reader::read_value(const char *id, size_t index, char &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, short &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, int &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, long &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, long long int &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, unsigned char &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, unsigned short &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, unsigned int &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, unsigned long &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, unsigned long long int &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, bool &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, float &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, double &value) -{ - sql::to_value(value, PQgetvalue(result_, static_cast(row_index_), static_cast(index))); -} - -void postgres_result_reader::read_value(const char *id, size_t index, char *value, size_t s) -{ - auto *val = PQgetvalue(result_, static_cast(row_index_), static_cast(index)); - - size_t len = strlen(value); - if (len > (size_t)s) { -#ifdef _MSC_VER - strncpy_s(val, s, value, s); -#else - strncpy(val, value, s); -#endif - val[s-1] = '\n'; - } else { -#ifdef _MSC_VER - strcpy_s(val, s, value); -#else - strcpy(val, value); -#endif - } -} - -void postgres_result_reader::read_value(const char *id, size_t index, std::string &value) -{ - auto *val = PQgetvalue(result_, static_cast(row_index_), static_cast(index)); - if (strlen(val) != 0) { - value.assign(val); - } -} - -void postgres_result_reader::read_value(const char *id, size_t index, std::string &value, size_t s) -{ - auto *val = PQgetvalue(result_, static_cast(row_index_), static_cast(index)); - if (strlen(val) != 0) { - value.assign(val); - } -} - } \ No newline at end of file diff --git a/backends/sqlite/include/sqlite_result_reader.hpp b/backends/sqlite/include/sqlite_result_reader.hpp index 930ead3..186e7d5 100644 --- a/backends/sqlite/include/sqlite_result_reader.hpp +++ b/backends/sqlite/include/sqlite_result_reader.hpp @@ -17,28 +17,11 @@ public: sqlite_result_reader(rows result, size_t column_count); ~sqlite_result_reader() override; - size_t column_count() const override; + [[nodiscard]] size_t column_count() const override; [[nodiscard]] const char* column(size_t index) const override; [[nodiscard]] bool fetch() override; - void read_value(const char *id, size_t index, char &value) override; - void read_value(const char *id, size_t index, short &value) override; - void read_value(const char *id, size_t index, int &value) override; - void read_value(const char *id, size_t index, long &value) override; - void read_value(const char *id, size_t index, long long int &value) override; - void read_value(const char *id, size_t index, unsigned char &value) override; - void read_value(const char *id, size_t index, unsigned short &value) override; - void read_value(const char *id, size_t index, unsigned int &value) override; - void read_value(const char *id, size_t index, unsigned long &value) override; - void read_value(const char *id, size_t index, unsigned long long int &value) override; - 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, 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 s) override; - private: rows result_; long long row_index_ = -1; diff --git a/backends/sqlite/src/sqlite_result_reader.cpp b/backends/sqlite/src/sqlite_result_reader.cpp index c361f96..e9e761f 100644 --- a/backends/sqlite/src/sqlite_result_reader.cpp +++ b/backends/sqlite/src/sqlite_result_reader.cpp @@ -34,99 +34,4 @@ bool sqlite_result_reader::fetch() return ++row_index_ < result_.size(); } -void sqlite_result_reader::read_value(const char *id, size_t index, char &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, short &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, int &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, long &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, long long int &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, unsigned char &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, unsigned short &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, unsigned int &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, unsigned long &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, unsigned long long int &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, bool &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, float &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, double &value) -{ - sql::to_value(value, result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, char *value, size_t size) -{ - auto val = result_[row_index_][index]; - size_t len = strlen(val); - if (len > size) { -#ifdef _MSC_VER - strncpy_s(value, size, val, len); -#else - strncpy(value, val, size); -#endif - value[size-1] = '\n'; - } else { -#ifdef _MSC_VER - strcpy_s(value, size, val); -#else - strcpy(value, val); -#endif - } -} - -void sqlite_result_reader::read_value(const char *id, size_t index, std::string &value) -{ - value.assign(result_[row_index_][index]); -} - -void sqlite_result_reader::read_value(const char *id, size_t index, std::string &value, size_t s) -{ - value.assign(result_[row_index_][index]); -} - } \ No newline at end of file diff --git a/include/matador/sql/query_result_reader.hpp b/include/matador/sql/query_result_reader.hpp index f118db6..931e22b 100644 --- a/include/matador/sql/query_result_reader.hpp +++ b/include/matador/sql/query_result_reader.hpp @@ -15,24 +15,24 @@ public: [[nodiscard]] virtual const char* column(size_t index) const = 0; [[nodiscard]] virtual bool fetch() = 0; - virtual void read_value(const char *id, size_t index, char &value) = 0; - virtual void read_value(const char *id, size_t index, short &value) = 0; - virtual void read_value(const char *id, size_t index, int &value) = 0; - virtual void read_value(const char *id, size_t index, long &value) = 0; - virtual void read_value(const char *id, size_t index, long long &value) = 0; - virtual void read_value(const char *id, size_t index, unsigned char &value) = 0; - virtual void read_value(const char *id, size_t index, unsigned short &value) = 0; - virtual void read_value(const char *id, size_t index, unsigned int &value) = 0; - virtual void read_value(const char *id, size_t index, unsigned long &value) = 0; - virtual void read_value(const char *id, size_t index, unsigned long long &value) = 0; - virtual void read_value(const char *id, size_t index, bool &value) = 0; - virtual void read_value(const char *id, size_t index, float &value) = 0; - virtual void read_value(const char *id, size_t index, double &value) = 0; -// virtual void read_value(const char *id, size_t index, matador::time &value) = 0; -// virtual void read_value(const char *id, size_t index, matador::date &value) = 0; - virtual void read_value(const char *id, size_t index, char *value, size_t s) = 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 s) = 0; + virtual void read_value(const char *id, size_t index, char &value); + virtual void read_value(const char *id, size_t index, short &value); + virtual void read_value(const char *id, size_t index, int &value); + virtual void read_value(const char *id, size_t index, long &value); + virtual void read_value(const char *id, size_t index, long long &value); + virtual void read_value(const char *id, size_t index, unsigned char &value); + virtual void read_value(const char *id, size_t index, unsigned short &value); + virtual void read_value(const char *id, size_t index, unsigned int &value); + virtual void read_value(const char *id, size_t index, unsigned long &value); + virtual void read_value(const char *id, size_t index, unsigned long long &value); + virtual void read_value(const char *id, size_t index, bool &value); + virtual void read_value(const char *id, size_t index, float &value); + virtual void read_value(const char *id, size_t index, double &value); +// virtual void read_value(const char *id, size_t index, matador::time &value); +// virtual void read_value(const char *id, size_t index, matador::date &value); + virtual void read_value(const char *id, size_t index, char *value, size_t s); + virtual void read_value(const char *id, size_t index, std::string &value); + virtual void read_value(const char *id, size_t index, std::string &value, size_t s); virtual void read_value(const char *id, size_t index, any_type &value, data_type_t type, size_t size); }; diff --git a/src/sql/query_result_reader.cpp b/src/sql/query_result_reader.cpp index 54bfffc..507ef78 100644 --- a/src/sql/query_result_reader.cpp +++ b/src/sql/query_result_reader.cpp @@ -3,6 +3,101 @@ namespace matador::sql { +void query_result_reader::read_value(const char *id, size_t index, char &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, short &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, int &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, long &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, long long int &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, unsigned char &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, unsigned short &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, unsigned int &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, unsigned long &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, unsigned long long int &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, bool &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, float &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, double &value) +{ + sql::to_value(value, column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, char *value, size_t size) +{ + auto val = column(index); + size_t len = strlen(val); + if (len > size) { +#ifdef _MSC_VER + strncpy_s(value, size, val, len); +#else + strncpy(value, val, size); +#endif + value[size-1] = '\n'; + } else { +#ifdef _MSC_VER + strcpy_s(value, size, val); +#else + strcpy(value, val); +#endif + } +} + +void query_result_reader::read_value(const char *id, size_t index, std::string &value) +{ + value.assign(column(index)); +} + +void query_result_reader::read_value(const char *id, size_t index, std::string &value, size_t s) +{ + value.assign(column(index)); +} + template < typename Type > void convert(const char *valstr, sql::any_type &value) {