From d62ca9f87906be6f046fe9d07afb8bfb69c166e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 16 Mar 2018 01:11:47 +0100
Subject: Use if constexpr to make things a lot more readable

---
 src/database/update_query.hpp | 51 +++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

(limited to 'src/database/update_query.hpp')

diff --git a/src/database/update_query.hpp b/src/database/update_query.hpp
index a29ac3f..0ee2bd9 100644
--- a/src/database/update_query.hpp
+++ b/src/database/update_query.hpp
@@ -39,27 +39,25 @@ struct UpdateQuery: public Query
   }
 
   template <int N=0, typename... T>
-  typename std::enable_if<N < sizeof...(T), void>::type
-  insert_col_name_and_value(const std::tuple<T...>& columns)
+  void insert_col_name_and_value(const std::tuple<T...>& columns)
   {
-    using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
-
-    if (!std::is_same<ColumnType, Id>::value)
+    if constexpr(N < sizeof...(T))
       {
-        this->body += ColumnType::name + "=$"s + std::to_string(this->current_param);
-        this->current_param++;
+        using ColumnType = std::decay_t<decltype(std::get<N>(columns))>;
 
-        if (N < (sizeof...(T) - 1))
-          this->body += ", ";
-      }
+        if (!std::is_same<ColumnType, Id>::value)
+          {
+            this->body += ColumnType::name + "=$"s
+                          + std::to_string(this->current_param);
+            this->current_param++;
 
-    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...>&)
-  {}
+            if (N < (sizeof...(T) - 1))
+              this->body += ", ";
+          }
 
+        this->insert_col_name_and_value<N + 1>(columns);
+      }
+  }
 
   template <typename... T>
   void execute(DatabaseEngine& db, const std::tuple<T...>& columns)
@@ -76,23 +74,20 @@ struct UpdateQuery: public Query
   }
 
   template <int N=0, typename... T>
-  typename std::enable_if<N < sizeof...(T), void>::type
-  bind_param(const std::tuple<T...>& columns, Statement& statement, int index=1)
+  void bind_param(const std::tuple<T...>& columns, Statement& statement, int index=1)
   {
-    auto&& column = std::get<N>(columns);
-    using ColumnType = std::decay_t<decltype(column)>;
+    if constexpr(N < sizeof...(T))
+      {
+        auto&& column = std::get<N>(columns);
+        using ColumnType = std::decay_t<decltype(column)>;
 
-    if (!std::is_same<ColumnType, Id>::value)
-      actual_bind(statement, column.value, index++);
+        if (!std::is_same<ColumnType, Id>::value)
+          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>
   void bind_id(const std::tuple<T...>& columns, Statement& statement)
   {
-- 
cgit v1.2.3