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/sqlite3_engine.hpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/database/sqlite3_engine.hpp

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

diff --git a/src/database/sqlite3_engine.hpp b/src/database/sqlite3_engine.hpp
new file mode 100644
index 0000000..eb18d0c
--- /dev/null
+++ b/src/database/sqlite3_engine.hpp
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <database/engine.hpp>
+
+#include <database/statement.hpp>
+
+#include <sqlite3.h>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <set>
+
+class Sqlite3Engine: public DatabaseEngine
+{
+ public:
+  Sqlite3Engine(sqlite3* db);
+
+  ~Sqlite3Engine();
+
+  static std::unique_ptr<DatabaseEngine> open(const std::string& string);
+
+  std::set<std::string> get_all_columns_from_table(const std::string& table_name) override final;
+  std::tuple<bool, std::string> raw_exec(const std::string& query) override final;
+  std::unique_ptr<Statement> prepare(const std::string& query) override;
+  void extract_last_insert_rowid(Statement& statement) override;
+  std::string id_column_type() override;
+private:
+  sqlite3* const db;
+};
+
-- 
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/sqlite3_engine.hpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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

diff --git a/src/database/sqlite3_engine.hpp b/src/database/sqlite3_engine.hpp
index eb18d0c..5b8176c 100644
--- a/src/database/sqlite3_engine.hpp
+++ b/src/database/sqlite3_engine.hpp
@@ -4,12 +4,17 @@
 
 #include <database/statement.hpp>
 
-#include <sqlite3.h>
 #include <memory>
 #include <string>
 #include <tuple>
 #include <set>
 
+#include <biboumi.h>
+
+#ifdef SQLITE3_FOUND
+
+#include <sqlite3.h>
+
 class Sqlite3Engine: public DatabaseEngine
 {
  public:
@@ -28,3 +33,15 @@ private:
   sqlite3* const db;
 };
 
+#else
+
+class Sqlite3Engine
+{
+public:
+  static std::unique_ptr<DatabaseEngine> open(const std::string& string)
+  {
+    throw std::runtime_error("Cannot open sqlite3 database "s + string + ": biboumi is not compiled with sqlite3 lib.");
+  }
+};
+
+#endif
-- 
cgit v1.2.3