From d0e3c71b91f1a1c1780158789fd42b8ac7209495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 17 Mar 2018 17:28:41 +0100 Subject: Revert "Use if constexpr to make things a lot more readable" This reverts commit d62ca9f87906be6f046fe9d07afb8bfb69c166e3. --- src/database/insert_query.hpp | 91 ++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 40 deletions(-) (limited to 'src/database/insert_query.hpp') diff --git a/src/database/insert_query.hpp b/src/database/insert_query.hpp index ed1944f..04c098c 100644 --- a/src/database/insert_query.hpp +++ b/src/database/insert_query.hpp @@ -11,17 +11,20 @@ #include template -void update_autoincrement_id(std::tuple& columns, Statement& statement) +typename std::enable_if::type +update_autoincrement_id(std::tuple& columns, Statement& statement) { - if constexpr(N < sizeof...(T)) - { - using ColumnType = typename std::decay(columns))>::type; - if (std::is_same::value) - auto&& column = std::get(columns); - update_autoincrement_id(columns, statement); - } + using ColumnType = typename std::decay(columns))>::type; + if (std::is_same::value) + auto&& column = std::get(columns); + update_autoincrement_id(columns, statement); } +template +typename std::enable_if::type +update_autoincrement_id(std::tuple&, Statement&) +{} + struct InsertQuery: public Query { template @@ -50,20 +53,23 @@ struct InsertQuery: public Query } template - void bind_param(const std::tuple& columns, Statement& statement, int index=1) + typename std::enable_if::type + bind_param(const std::tuple& columns, Statement& statement, int index=1) { - if constexpr(N < sizeof...(T)) - { - auto&& column = std::get(columns); - using ColumnType = std::decay_t; + auto&& column = std::get(columns); + using ColumnType = std::decay_t; - if constexpr(!std::is_same::value) - actual_bind(statement, column.value, index++); + if (!std::is_same::value) + actual_bind(statement, column.value, index++); - this->bind_param(columns, statement, index); - } + this->bind_param(columns, statement, index); } + template + typename std::enable_if::type + bind_param(const std::tuple&, Statement&, int) + {} + template void insert_values(const std::tuple& columns) { @@ -73,21 +79,23 @@ struct InsertQuery: public Query } template - void insert_value(const std::tuple& columns, int index=1) + typename std::enable_if::type + insert_value(const std::tuple& columns, int index=1) { - if constexpr(N < sizeof...(T)) + using ColumnType = std::decay_t(columns))>; + + if (!std::is_same::value) { - using ColumnType = std::decay_t(columns))>; - - if (!std::is_same::value) - { - this->body += "$" + std::to_string(index++); - if (N != sizeof...(T) - 1) - this->body += ", "; - } - this->insert_value(columns, index); + this->body += "$" + std::to_string(index++); + if (N != sizeof...(T) - 1) + this->body += ", "; } + this->insert_value(columns, index); } + template + typename std::enable_if::type + insert_value(const std::tuple&, const int) + { } template void insert_col_names(const std::tuple& columns) @@ -98,21 +106,24 @@ struct InsertQuery: public Query } template - void insert_col_name(const std::tuple& columns) + typename std::enable_if::type + insert_col_name(const std::tuple& columns) { - if constexpr(N < sizeof...(T)) - { - using ColumnType = std::decay_t(columns))>; + using ColumnType = std::decay_t(columns))>; - if (!std::is_same::value) - { - this->body += ColumnType::name; - - if (N < (sizeof...(T) - 1)) - this->body += ", "; - } + if (!std::is_same::value) + { + this->body += ColumnType::name; - this->insert_col_name(columns); + if (N < (sizeof...(T) - 1)) + this->body += ", "; } + + this->insert_col_name(columns); } + + template + typename std::enable_if::type + insert_col_name(const std::tuple&) + {} }; -- cgit v1.2.3