From 50cadf3dac0d56ef8181d1800cc30f8dcb749141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 13 Jun 2017 10:38:39 +0200
Subject: Implement our own database ORM, and update the whole code to use it

Entirely replace LiteSQL

fix #3271
---
 src/database/query.hpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/database/query.hpp

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

diff --git a/src/database/query.hpp b/src/database/query.hpp
new file mode 100644
index 0000000..92845d0
--- /dev/null
+++ b/src/database/query.hpp
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <logger/logger.hpp>
+
+#include <vector>
+#include <string>
+
+#include <sqlite3.h>
+
+struct Query
+{
+    std::string body;
+    std::vector<std::string> params;
+
+    Query(std::string str):
+        body(std::move(str))
+    {}
+
+    sqlite3_stmt* prepare(sqlite3* db)
+    {
+      sqlite3_stmt* statement;
+      log_debug(this->body);
+      auto res = sqlite3_prepare(db, this->body.data(), static_cast<int>(this->body.size()) + 1,
+                                 &statement, nullptr);
+      if (res != SQLITE_OK)
+        {
+          log_error("Error preparing statement: ", sqlite3_errmsg(db));
+          return nullptr;
+        }
+      return statement;
+    }
+};
+
+template <typename ColumnType>
+void add_param(Query& query, const ColumnType& column)
+{
+  actual_add_param(query, column.value);
+}
+
+template <typename T>
+void actual_add_param(Query& query, const T& val)
+{
+  query.params.push_back(std::to_string(val));
+}
+
+void actual_add_param(Query& query, const std::string& val);
-- 
cgit v1.2.3


From 9defd0ccb75b1905c308ed0437e5ccd479e3a7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 14 Jun 2017 00:04:00 +0200
Subject: Add a Statement class to manage the sqlite3_stmt objects and avoid
 leaks

---
 src/database/query.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/src/database/query.hpp b/src/database/query.hpp
index 92845d0..b77a421 100644
--- a/src/database/query.hpp
+++ b/src/database/query.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <database/statement.hpp>
+
 #include <logger/logger.hpp>
 
 #include <vector>
@@ -16,7 +18,7 @@ struct Query
         body(std::move(str))
     {}
 
-    sqlite3_stmt* prepare(sqlite3* db)
+    Statement prepare(sqlite3* db)
     {
       sqlite3_stmt* statement;
       log_debug(this->body);
@@ -27,7 +29,7 @@ struct Query
           log_error("Error preparing statement: ", sqlite3_errmsg(db));
           return nullptr;
         }
-      return statement;
+      return {statement};
     }
 };
 
-- 
cgit v1.2.3