King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-02-17 11:45:50 +00:00
Code Issues Releases Wiki Activity

Fix build error when passing a vector<string_ref> to query()

Browse source
This commit is contained in:
King_DuckZ 2016-05-13 20:46:13 +02:00
parent 61fa9628a5
commit 537023dbfa
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/pq/connection.hpp
View file

@ -80,7 +80,7 @@ namespace pq {
auto types_bt = concat_strings(make_pqtypes_name<typename remove_cv<typename remove_reference<Args>::type>::type>()...);
static_assert(types_bt.size() > 0, "Invalid empty types string (function called with no arguments?)");
const std::string types(types_bt.data(), types_bt.size());
return this->make_params(&types, implem::get_pqlib_c_type_struct<typename remove_cv<typename remove_reference<Args>::type>::type>(*this).conv(parArgs)...);
return this->make_params(&types, implem::get_pqlib_c_type_struct<typename remove_cv<typename remove_reference<Args>::type>::type>(this).conv(parArgs)...);
};
PGParams pgparams = make_pgparams();

18
include/pq/implem/pq_type_helpers.hpp
View file

@ -39,13 +39,13 @@ namespace pq {
template <typename T>
struct get_pqlib_c_type_struct {
using type = T;
explicit get_pqlib_c_type_struct ( const Connection& ) { }
explicit get_pqlib_c_type_struct ( const Connection* ) { }
static type conv ( T parParam ) { return parParam; }
};
template <>
struct get_pqlib_c_type_struct<std::string> {
using type = const char*;
explicit get_pqlib_c_type_struct ( const Connection& ) { }
explicit get_pqlib_c_type_struct ( const Connection* ) { }
static type conv ( const std::string& parParam ) { return parParam.c_str(); }
};
template <>
@ -54,13 +54,13 @@ namespace pq {
std::string m_str;
public:
using type = const char*;
explicit get_pqlib_c_type_struct ( const Connection& ) { }
explicit get_pqlib_c_type_struct ( const Connection* ) { }
type conv ( boost::string_ref parParam ) { m_str = std::string(parParam.data(), parParam.size()); return m_str.c_str(); }
};
template <>
struct get_pqlib_c_type_struct<bool> {
using type = int;
explicit get_pqlib_c_type_struct ( const Connection& ) { }
explicit get_pqlib_c_type_struct ( const Connection* ) { }
static type conv ( bool parParam ) { return (parParam ? 1 : 0); }
};
template <>
@ -78,7 +78,7 @@ namespace pq {
public:
using type = const storage*;
explicit get_pqlib_c_type_struct ( const Connection& ) { }
explicit get_pqlib_c_type_struct ( const Connection* ) { }
type conv ( const std::chrono::system_clock::time_point& parParam );
~get_pqlib_c_type_struct ( void ) noexcept;
};
@ -173,8 +173,10 @@ namespace pq {
storage m_storage;
PGParams m_par;
const Connection* m_conn;
protected:
explicit get_pqlib_c_type_struct_arr ( const Connection& parConn );
explicit get_pqlib_c_type_struct_arr ( const Connection* parConn );
~get_pqlib_c_type_struct_arr ( void ) noexcept;
void par_reset ( void );
const void* get_return_ptr ( void );
@ -182,13 +184,13 @@ namespace pq {
void push_param ( const T& parParam ) {
static_assert(std::is_fundamental<T>::value or std::is_same<std::string, T>::value or std::is_same<boost::string_ref, T>::value or std::is_same<std::chrono::system_clock::time_point, T>::value, "Unsupported type in array");
this->push_param(make_pqtypes_name<T>().data(), get_pqlib_c_type_struct<T>::conv(parParam));
this->push_param(make_pqtypes_name<T>().data(), get_pqlib_c_type_struct<T>(m_conn).conv(parParam));
}
};
template <typename VT, typename VU>
struct get_pqlib_c_type_struct<std::vector<VT, VU>> : private get_pqlib_c_type_struct_arr {
using type = const void*;
explicit get_pqlib_c_type_struct ( const Connection& parConn ) : get_pqlib_c_type_struct_arr(parConn) { }
explicit get_pqlib_c_type_struct ( const Connection* parConn ) : get_pqlib_c_type_struct_arr(parConn) { }
type conv ( const std::vector<VT, VU>& parParam) {
this->par_reset();
for (const auto& i : parParam) {

13
src/pq/pq_type_helpers.cpp
View file

@ -26,6 +26,13 @@
#endif
namespace pq {
namespace {
const Connection* assert_not_null_and_return (const Connection* parConn) {
assert(parConn);
return parConn;
}
} //unnamed namespace
namespace implem {
template <
typename Expected,
@ -76,10 +83,12 @@ namespace pq {
return;
}
get_pqlib_c_type_struct_arr::get_pqlib_c_type_struct_arr (const Connection& parConn) :
m_par(parConn.make_empty_params())
get_pqlib_c_type_struct_arr::get_pqlib_c_type_struct_arr (const Connection* parConn) :
m_par(assert_not_null_and_return(parConn)->make_empty_params()),
m_conn(parConn)
{
static_assert_size<PGarray, storage>();
assert(m_conn);
PGarray arr;
std::fill(reinterpret_cast<char*>(&arr), reinterpret_cast<char*>(&arr) + sizeof(PGarray), '\0');