sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

moved redundant read value code into query_result_reader

This commit is contained in:
Sascha Kuehl 2023-11-27 17:25:46 +01:00
parent f3c502a2ce
commit 6a4111ba3d
6 changed files with 114 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backends/postgres/include/postgres_result_reader.hpp
View File

@ -16,23 +16,6 @@ public:
[[nodiscard]] const char *column(size_t index) const override; [[nodiscard]] const char *column(size_t index) const override;
bool fetch() 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: private:
PGresult *result_{}; PGresult *result_{};

102
backends/postgres/src/postgres_result_reader.cpp
View File

@ -32,106 +32,4 @@ bool postgres_result_reader::fetch()
return ++row_index_ < row_count_; 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<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, short &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, int &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, long &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(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<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, unsigned char &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, unsigned short &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, unsigned int &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, unsigned long &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(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<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, bool &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, float &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, double &value)
{
sql::to_value(value, PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(index)));
}
void postgres_result_reader::read_value(const char *id, size_t index, char *value, size_t s)
{
auto *val = PQgetvalue(result_, static_cast<int>(row_index_), static_cast<int>(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<int>(row_index_), static_cast<int>(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<int>(row_index_), static_cast<int>(index));
if (strlen(val) != 0) {
value.assign(val);
}
}
} }

19
backends/sqlite/include/sqlite_result_reader.hpp
View File

@ -17,28 +17,11 @@ public:
sqlite_result_reader(rows result, size_t column_count); sqlite_result_reader(rows result, size_t column_count);
~sqlite_result_reader() override; ~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]] const char* column(size_t index) const override;
[[nodiscard]] bool fetch() 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: private:
rows result_; rows result_;
long long row_index_ = -1; long long row_index_ = -1;

95
backends/sqlite/src/sqlite_result_reader.cpp
View File

@ -34,99 +34,4 @@ bool sqlite_result_reader::fetch()
return ++row_index_ < result_.size(); 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]);
}
} }

36
include/matador/sql/query_result_reader.hpp
View File

@ -15,24 +15,24 @@ public:
[[nodiscard]] virtual const char* column(size_t index) const = 0; [[nodiscard]] virtual const char* column(size_t index) const = 0;
[[nodiscard]] virtual bool fetch() = 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, char &value);
virtual void read_value(const char *id, size_t index, short &value) = 0; virtual void read_value(const char *id, size_t index, short &value);
virtual void read_value(const char *id, size_t index, int &value) = 0; virtual void read_value(const char *id, size_t index, int &value);
virtual void read_value(const char *id, size_t index, long &value) = 0; 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) = 0; 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) = 0; 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) = 0; 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) = 0; 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) = 0; 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) = 0; 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) = 0; virtual void read_value(const char *id, size_t index, bool &value);
virtual void read_value(const char *id, size_t index, float &value) = 0; virtual void read_value(const char *id, size_t index, float &value);
virtual void read_value(const char *id, size_t index, double &value) = 0; 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) = 0; // 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) = 0; // 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) = 0; 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) = 0; 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) = 0; 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); virtual void read_value(const char *id, size_t index, any_type &value, data_type_t type, size_t size);
}; };

95
src/sql/query_result_reader.cpp
View File

@ -3,6 +3,101 @@
namespace matador::sql { 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 > template < typename Type >
void convert(const char *valstr, sql::any_type &value) void convert(const char *valstr, sql::any_type &value)
{ {