Commit d0e3c71b authored by louiz’'s avatar louiz’

Revert "Use if constexpr to make things a lot more readable"

This reverts commit d62ca9f8.
parent d62ca9f8
...@@ -8,16 +8,19 @@ ...@@ -8,16 +8,19 @@
namespace namespace
{ {
template <std::size_t N=0, typename... T> template <std::size_t N=0, typename... T>
void add_column_name(std::string& out) typename std::enable_if<N == sizeof...(T), void>::type
add_column_name(std::string&)
{ }
template <std::size_t N=0, typename... T>
typename std::enable_if<N < sizeof...(T), void>::type
add_column_name(std::string& out)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<std::tuple<T...>>()))>::type;
{ out += ColumnType::name;
using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<std::tuple<T...>>()))>::type; if (N != sizeof...(T) - 1)
out += ColumnType::name; out += ",";
if (N != sizeof...(T) - 1) add_column_name<N+1, T...>(out);
out += ",";
add_column_name<N + 1, T...>(out);
}
} }
} }
......
...@@ -11,17 +11,20 @@ ...@@ -11,17 +11,20 @@
#include <tuple> #include <tuple>
template <std::size_t N=0, typename... T> template <std::size_t N=0, typename... T>
void update_autoincrement_id(std::tuple<T...>& columns, Statement& statement) typename std::enable_if<N < sizeof...(T), void>::type
update_autoincrement_id(std::tuple<T...>& columns, Statement& statement)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = typename std::decay<decltype(std::get<N>(columns))>::type;
{ if (std::is_same<ColumnType, Id>::value)
using ColumnType = typename std::decay<decltype(std::get<N>(columns))>::type; auto&& column = std::get<Id>(columns);
if (std::is_same<ColumnType, Id>::value) update_autoincrement_id<N+1>(columns, statement);
auto&& column = std::get<Id>(columns);
update_autoincrement_id<N + 1>(columns, statement);
}
} }
template <std::size_t N=0, typename... T>
typename std::enable_if<N == sizeof...(T), void>::type
update_autoincrement_id(std::tuple<T...>&, Statement&)
{}
struct InsertQuery: public Query struct InsertQuery: public Query
{ {
template <typename... T> template <typename... T>
...@@ -50,20 +53,23 @@ struct InsertQuery: public Query ...@@ -50,20 +53,23 @@ struct InsertQuery: public Query
} }
template <int N=0, typename... T> template <int N=0, typename... T>
void bind_param(const std::tuple<T...>& columns, Statement& statement, int index=1) typename std::enable_if<N < sizeof...(T), void>::type
bind_param(const std::tuple<T...>& columns, Statement& statement, int index=1)
{ {
if constexpr(N < sizeof...(T)) auto&& column = std::get<N>(columns);
{ using ColumnType = std::decay_t<decltype(column)>;
auto&& column = std::get<N>(columns);
using ColumnType = std::decay_t<decltype(column)>;
if constexpr(!std::is_same<ColumnType, Id>::value) if (!std::is_same<ColumnType, Id>::value)
actual_bind(statement, column.value, index++); actual_bind(statement, column.value, index++);
this->bind_param<N + 1>(columns, statement, index); this->bind_param<N+1>(columns, statement, index);
}
} }
template <int N=0, typename... T>
typename std::enable_if<N == sizeof...(T), void>::type
bind_param(const std::tuple<T...>&, Statement&, int)
{}
template <typename... T> template <typename... T>
void insert_values(const std::tuple<T...>& columns) void insert_values(const std::tuple<T...>& columns)
{ {
...@@ -73,21 +79,23 @@ struct InsertQuery: public Query ...@@ -73,21 +79,23 @@ struct InsertQuery: public Query
} }
template <int N=0, typename... T> template <int N=0, typename... T>
void insert_value(const std::tuple<T...>& columns, int index=1) typename std::enable_if<N < sizeof...(T), void>::type
insert_value(const std::tuple<T...>& columns, int index=1)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
if (!std::is_same<ColumnType, Id>::value)
{ {
using ColumnType = std::decay_t<decltype(std::get<N>(columns))>; this->body += "$" + std::to_string(index++);
if (N != sizeof...(T) - 1)
if (!std::is_same<ColumnType, Id>::value) this->body += ", ";
{
this->body += "$" + std::to_string(index++);
if (N != sizeof...(T) - 1)
this->body += ", ";
}
this->insert_value<N + 1>(columns, index);
} }
this->insert_value<N+1>(columns, index);
} }
template <int N=0, typename... T>
typename std::enable_if<N == sizeof...(T), void>::type
insert_value(const std::tuple<T...>&, const int)
{ }
template <typename... T> template <typename... T>
void insert_col_names(const std::tuple<T...>& columns) void insert_col_names(const std::tuple<T...>& columns)
...@@ -98,21 +106,24 @@ struct InsertQuery: public Query ...@@ -98,21 +106,24 @@ struct InsertQuery: public Query
} }
template <int N=0, typename... T> template <int N=0, typename... T>
void insert_col_name(const std::tuple<T...>& columns) typename std::enable_if<N < sizeof...(T), void>::type
insert_col_name(const std::tuple<T...>& columns)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
{
using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
if (!std::is_same<ColumnType, Id>::value) if (!std::is_same<ColumnType, Id>::value)
{ {
this->body += ColumnType::name; this->body += ColumnType::name;
if (N < (sizeof...(T) - 1))
this->body += ", ";
}
this->insert_col_name<N + 1>(columns); if (N < (sizeof...(T) - 1))
this->body += ", ";
} }
this->insert_col_name<N+1>(columns);
} }
template <int N=0, typename... T>
typename std::enable_if<N == sizeof...(T), void>::type
insert_col_name(const std::tuple<T...>&)
{}
}; };
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
void actual_bind(Statement& statement, const std::string& value, int index); void actual_bind(Statement& statement, const std::string& value, int index);
void actual_bind(Statement& statement, const std::int64_t& value, int index); void actual_bind(Statement& statement, const std::int64_t& value, int index);
void actual_bind(Statement& statement, const std::optional<bool>& value, int index); template <typename T, typename std::enable_if_t<std::is_integral<T>::value>* = 0>
template <typename T>
void actual_bind(Statement& statement, const T& value, int index) void actual_bind(Statement& statement, const T& value, int index)
{ {
actual_bind(statement, static_cast<std::int64_t>(value), index); actual_bind(statement, static_cast<std::int64_t>(value), index);
} }
void actual_bind(Statement& statement, const std::optional<bool>& value, int index);
#ifdef DEBUG_SQL_QUERIES #ifdef DEBUG_SQL_QUERIES
#include <utils/scopetimer.hpp> #include <utils/scopetimer.hpp>
...@@ -57,27 +57,38 @@ struct Query ...@@ -57,27 +57,38 @@ struct Query
#endif #endif
}; };
void actual_add_param(Query& query, const std::string& val); template <typename ColumnType>
void actual_add_param(Query& query, const std::optional<bool>& val); void add_param(Query& query, const ColumnType& column)
{
std::cout << "add_param<ColumnType>" << std::endl;
actual_add_param(query, column.value);
}
template <typename T> template <typename T>
void actual_add_param(Query& query, const T& val) void actual_add_param(Query& query, const T& val)
{ {
query.params.push_back(std::to_string(val)); query.params.push_back(std::to_string(val));
} }
void actual_add_param(Query& query, const std::string& val);
template <typename T>
typename std::enable_if<!std::is_integral<T>::value, Query&>::type
operator<<(Query& query, const T&)
{
query.body += T::name;
return query;
}
void actual_add_param(Query& query, const std::optional<bool>& val);
Query& operator<<(Query& query, const char* str); Query& operator<<(Query& query, const char* str);
Query& operator<<(Query& query, const std::string& str); Query& operator<<(Query& query, const std::string& str);
template <typename T> template <typename Integer>
Query& operator<<(Query& query, const T& i) typename std::enable_if<std::is_integral<Integer>::value, Query&>::type
operator<<(Query& query, const Integer& i)
{ {
if constexpr(std::is_integral<T>::value) query.body += "$" + std::to_string(query.current_param++);
{ actual_add_param(query, i);
query.body += "$" + std::to_string(query.current_param++);
actual_add_param(query, i);
}
else
{
query.body += T::name;
}
return query; return query;
} }
...@@ -29,39 +29,41 @@ struct Row ...@@ -29,39 +29,41 @@ struct Row
return col.value; return col.value;
} }
void save(std::unique_ptr<DatabaseEngine>& db) template <bool Coucou=true>
void save(std::unique_ptr<DatabaseEngine>& db, typename std::enable_if<!is_one_of<Id, T...> && Coucou>::type* = nullptr)
{ {
if constexpr(is_one_of<Id, T...>) this->insert(*db);
}
template <bool Coucou=true>
void save(std::unique_ptr<DatabaseEngine>& db, typename std::enable_if<is_one_of<Id, T...> && Coucou>::type* = nullptr)
{
const Id& id = std::get<Id>(this->columns);
if (id.value == Id::unset_value)
{ {
const Id& id = std::get<Id>(this->columns); this->insert(*db);
if (id.value == Id::unset_value) if (db->last_inserted_rowid >= 0)
{ std::get<Id>(this->columns).value = static_cast<Id::real_type>(db->last_inserted_rowid);
this->insert(*db);
if (db->last_inserted_rowid >= 0)
std::get<Id>(this->columns).value = static_cast<Id::real_type>(db->last_inserted_rowid);
}
else
this->update(*db);
} }
else else
this->insert(*db); this->update(*db);
} }
private: private:
void insert(DatabaseEngine& db) template <bool Coucou=true>
void insert(DatabaseEngine& db, typename std::enable_if<is_one_of<Id, T...> && Coucou>::type* = nullptr)
{ {
if constexpr(is_one_of<Id, T...>) InsertQuery query(this->table_name, this->columns);
{ // Ugly workaround for non portable stuff
InsertQuery query(this->table_name, this->columns); query.body += db.get_returning_id_sql_string(Id::name);
// Ugly workaround for non portable stuff query.execute(db, this->columns);
query.body += db.get_returning_id_sql_string(Id::name); }
query.execute(db, this->columns);
} template <bool Coucou=true>
else void insert(DatabaseEngine& db, typename std::enable_if<!is_one_of<Id, T...> && Coucou>::type* = nullptr)
{ {
InsertQuery query(this->table_name, this->columns); InsertQuery query(this->table_name, this->columns);
query.execute(db, this->columns); query.execute(db, this->columns);
}
} }
void update(DatabaseEngine& db) void update(DatabaseEngine& db)
......
...@@ -15,37 +15,48 @@ ...@@ -15,37 +15,48 @@
using namespace std::string_literals; using namespace std::string_literals;
template <typename T> template <typename T>
auto extract_row_value(Statement& statement, const int i) typename std::enable_if<std::is_integral<T>::value, std::int64_t>::type
extract_row_value(Statement& statement, const int i)
{ {
if constexpr(std::is_integral<T>::value) return statement.get_column_int64(i);
return statement.get_column_int64(i); }
else if constexpr (std::is_same<std::string, T>::value)
return statement.get_column_text(i); template <typename T>
else if (std::is_same<std::optional<bool>, T>::value) typename std::enable_if<std::is_same<std::string, T>::value, T>::type
{ extract_row_value(Statement& statement, const int i)
const auto integer = statement.get_column_int(i); {
if (integer > 0) return statement.get_column_text(i);
return std::optional<bool>{true}; }
else if (integer < 0)
return std::optional<bool>{false}; template <typename T>
return std::optional<bool>{}; typename std::enable_if<std::is_same<std::optional<bool>, T>::value, T>::type
} extract_row_value(Statement& statement, const int i)
{
const auto integer = statement.get_column_int(i);
if (integer > 0)
return true;
else if (integer < 0)
return false;
return std::nullopt;
} }
template <std::size_t N=0, typename... T> template <std::size_t N=0, typename... T>
void extract_row_values(Row<T...>& row, Statement& statement) typename std::enable_if<N < sizeof...(T), void>::type
extract_row_values(Row<T...>& row, Statement& statement)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = typename std::remove_reference<decltype(std::get<N>(row.columns))>::type;
{
using ColumnType = typename std::remove_reference<decltype(std::get<N>(row.columns))>::type;
auto&& column = std::get<N>(row.columns); auto&& column = std::get<N>(row.columns);
column.value = static_cast<decltype(column.value)>(extract_row_value<typename ColumnType::real_type>(statement, N)); column.value = static_cast<decltype(column.value)>(extract_row_value<typename ColumnType::real_type>(statement, N));
extract_row_values<N + 1>(row, statement); extract_row_values<N+1>(row, statement);
}
} }
template <std::size_t N=0, typename... T>
typename std::enable_if<N == sizeof...(T), void>::type
extract_row_values(Row<T...>&, Statement&)
{}
template <typename... T> template <typename... T>
struct SelectQuery: public Query struct SelectQuery: public Query
{ {
...@@ -58,21 +69,23 @@ struct SelectQuery: public Query ...@@ -58,21 +69,23 @@ struct SelectQuery: public Query
} }
template <std::size_t N=0> template <std::size_t N=0>
void insert_col_name() typename std::enable_if<N < sizeof...(T), void>::type
insert_col_name()
{ {
if constexpr(N < sizeof...(T)) using ColumnsType = std::tuple<T...>;
{ using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnsType>()))>::type;
using ColumnsType = std::tuple<T...>;
using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnsType>()))>::type;
this->body += " " + std::string{ColumnType::name}; this->body += " " + std::string{ColumnType::name};
if (N < (sizeof...(T) - 1)) if (N < (sizeof...(T) - 1))
this->body += ", "; this->body += ", ";
this->insert_col_name<N + 1>(); this->insert_col_name<N+1>();
}
} }
template <std::size_t N=0>
typename std::enable_if<N == sizeof...(T), void>::type
insert_col_name()
{}
SelectQuery& where() SelectQuery& where()
{ {
......
...@@ -93,32 +93,36 @@ class Table ...@@ -93,32 +93,36 @@ class Table
private: private:
template <std::size_t N=0> template <std::size_t N=0>
void add_column_if_not_exists(DatabaseEngine& db, const std::set<std::string>& existing_columns) typename std::enable_if<N < sizeof...(T), void>::type
add_column_if_not_exists(DatabaseEngine& db, const std::set<std::string>& existing_columns)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnTypes>()))>::type;
{ if (existing_columns.count(ColumnType::name) == 0)
using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnTypes>()))>::type; add_column_to_table<ColumnType>(db, this->name);
if (existing_columns.count(ColumnType::name) == 0) add_column_if_not_exists<N+1>(db, existing_columns);
add_column_to_table<ColumnType>(db, this->name);
add_column_if_not_exists<N + 1>(db, existing_columns);
}
} }
template <std::size_t N=0>
typename std::enable_if<N == sizeof...(T), void>::type
add_column_if_not_exists(DatabaseEngine&, const std::set<std::string>&)
{}
template <std::size_t N=0> template <std::size_t N=0>
void add_column_create(DatabaseEngine& db, std::string& str) typename std::enable_if<N < sizeof...(T), void>::type
add_column_create(DatabaseEngine& db, std::string& str)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnTypes>()))>::type;
{ str += ColumnType::name;
using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnTypes>()))>::type; str += " ";
str += ColumnType::name; str += ToSQLType<ColumnType>(db);
str += " "; if (N != sizeof...(T) - 1)
str += ToSQLType<ColumnType>(db); str += ",";
if (N != sizeof...(T) - 1)
str += ","; add_column_create<N+1>(db, str);
add_column_create<N + 1>(db, str);
}
} }
template <std::size_t N=0>
typename std::enable_if<N == sizeof...(T), void>::type
add_column_create(DatabaseEngine&, std::string&)
{ }
const std::string name; const std::string name;
}; };
...@@ -39,25 +39,27 @@ struct UpdateQuery: public Query ...@@ -39,25 +39,27 @@ struct UpdateQuery: public Query
} }
template <int N=0, typename... T> template <int N=0, typename... T>
void insert_col_name_and_value(const std::tuple<T...>& columns) typename std::enable_if<N < sizeof...(T), void>::type
insert_col_name_and_value(const std::tuple<T...>& columns)
{ {
if constexpr(N < sizeof...(T)) using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
{
using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
if (!std::is_same<ColumnType, Id>::value)
{
this->body += ColumnType::name + "=$"s
+ std::to_string(this->current_param);
this->current_param++;
if (N < (sizeof...(T) - 1)) if (!std::is_same<ColumnType, Id>::value)
this->body += ", "; {
} this->body += ColumnType::name + "=$"s + std::to_string(this->current_param);
this->current_param++;
this->insert_col_name_and_value<N + 1>(columns); if (N < (sizeof...(T) - 1))
this->body += ", ";
} }
this->insert_col_name_and_value<N+1>(columns);
} }
template <int N=0, typename... T>
typename std::enable_if<N == sizeof...(T), void>::type
insert_col_name_and_value(const std::tuple<T...>&)
{}
template <typename... T> template <typename... T>
void execute(DatabaseEngine& db, const std::tuple<T...>& columns) void execute(DatabaseEngine& db, const std::tuple<T...>& columns)
...@@ -74,20 +76,23 @@ struct UpdateQuery: public Query ...@@ -74,20 +76,23 @@ struct UpdateQuery: public Query
} }
template <int N=0, typename... T> template <int N=0, typename... T>
void bind_param(const std::tuple<T...>& columns, Statement& statement, int index=1) typename std::enable_if<N < sizeof...(T), void>::type
bind_param(const std::tuple<T...>& columns, Statement& statement, int index=1)
{ {
if constexpr(N < sizeof...(T)) auto&& column = std::get<N>(columns);
{ using ColumnType = std::decay_t<decltype(column)>;
auto&& column = std::get<N>(columns);
using ColumnType = std::decay_t<decltype(column)>;
if (!std::is_same<ColumnType, Id>::value) if (!std::is_same<ColumnType, Id>::value)
actual_bind(statement, column.value, index++); actual_bind(statement, column.value, index++);
this->bind_param<N + 1>(columns, statement, index); this->bind_param<