From 0168b96b79db2627fdba77a8712956408aa081d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 4 Oct 2017 21:28:18 +0200
Subject: Add postgresql support

---
 src/database/select_query.hpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp
index 872001c..22b342e 100644
--- a/src/database/select_query.hpp
+++ b/src/database/select_query.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <database/engine.hpp>
+
 #include <database/statement.hpp>
 #include <database/query.hpp>
 #include <logger/logger.hpp>
@@ -18,24 +20,21 @@ template <typename T>
 typename std::enable_if<std::is_integral<T>::value, sqlite3_int64>::type
 extract_row_value(Statement& statement, const int i)
 {
-  return sqlite3_column_int64(statement.get(), i);
+  return statement.get_column_int64(i);
 }
 
 template <typename T>
 typename std::enable_if<std::is_same<std::string, T>::value, T>::type
 extract_row_value(Statement& statement, const int i)
 {
-  const auto size = sqlite3_column_bytes(statement.get(), i);
-  const unsigned char* str = sqlite3_column_text(statement.get(), i);
-  std::string result(reinterpret_cast<const char*>(str), static_cast<std::size_t>(size));
-  return result;
+  return statement.get_column_text(i);
 }
 
 template <typename T>
 typename std::enable_if<std::is_same<OptionalBool, T>::value, T>::type
 extract_row_value(Statement& statement, const int i)
 {
-  const auto integer = sqlite3_column_int(statement.get(), i);
+  const auto integer = statement.get_column_int(i);
   OptionalBool result;
   if (integer > 0)
     result.set_value(true);
@@ -109,16 +108,21 @@ struct SelectQuery: public Query
       return *this;
     }
 
-    auto execute(sqlite3* db)
+    auto execute(DatabaseEngine& db)
     {
-      auto statement = this->prepare(db);
       std::vector<Row<T...>> rows;
-      while (sqlite3_step(statement.get()) == SQLITE_ROW)
+
+      auto statement = db.prepare(this->body);
+      statement->bind(std::move(this->params));
+
+      while (statement->step() == StepResult::Row)
         {
+          log_debug("one result.");
           Row<T...> row(this->table_name);
-          extract_row_values(row, statement);
+          extract_row_values(row, *statement);
           rows.push_back(row);
         }
+
       return rows;
     }
 
-- 
cgit v1.2.3


From 414bbca0bc2bf20c4f424c2368997a46129b32cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 1 Dec 2017 14:59:22 +0100
Subject: Handle postgresql and sqlite3 libs properly

Do not fail to compile when one of them is missing but the other one is not.

Raise an error when trying to open a database with the missing library.

see #3237
---
 src/database/select_query.hpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp
index 22b342e..837a866 100644
--- a/src/database/select_query.hpp
+++ b/src/database/select_query.hpp
@@ -12,12 +12,10 @@
 #include <vector>
 #include <string>
 
-#include <sqlite3.h>
-
 using namespace std::string_literals;
 
 template <typename T>
-typename std::enable_if<std::is_integral<T>::value, sqlite3_int64>::type
+typename std::enable_if<std::is_integral<T>::value, std::int64_t>::type
 extract_row_value(Statement& statement, const int i)
 {
   return statement.get_column_int64(i);
-- 
cgit v1.2.3


From 3cd649023680bd49f9865fd62474d4db6a9d7c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Sun, 14 Jan 2018 21:44:22 +0100
Subject: Remove all the ugly database debug

---
 src/database/select_query.hpp | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp
index 837a866..af2ac1c 100644
--- a/src/database/select_query.hpp
+++ b/src/database/select_query.hpp
@@ -115,7 +115,6 @@ struct SelectQuery: public Query
 
       while (statement->step() == StepResult::Row)
         {
-          log_debug("one result.");
           Row<T...> row(this->table_name);
           extract_row_values(row, *statement);
           rows.push_back(row);
-- 
cgit v1.2.3


From 7e64a2e361adcdbd2fce5ad76051a150b4de062d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Sun, 14 Jan 2018 21:46:49 +0100
Subject: Add a DEBUG_SQL_QUERIES to log info about the executed SQL queries

fix #3324
---
 src/database/select_query.hpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp
index af2ac1c..5a17f38 100644
--- a/src/database/select_query.hpp
+++ b/src/database/select_query.hpp
@@ -110,6 +110,10 @@ struct SelectQuery: public Query
     {
       std::vector<Row<T...>> rows;
 
+#ifdef DEBUG_SQL_QUERIES
+      const auto timer = this->log_and_time();
+#endif
+
       auto statement = db.prepare(this->body);
       statement->bind(std::move(this->params));
 
-- 
cgit v1.2.3