1 files changed, 11 insertions, 24 deletions

diff --git a/store/database.h b/store/database.h
index ab398a4..2bf0556 100644
--- a/store/database.h
+++ b/store/database.h
@@ -1,38 +1,25 @@
 #pragma once
 
-#include <lmdb.h>
 #include <string>
 #include <QString>
 
 class Database {
 public:
+    enum TransactionType { ReadOnly, ReadWrite };
+
     Database(const QString &path);
     ~Database();
-    MDB_txn *startTransaction();
-    void endTransaction(MDB_txn *transaction);
-    void write(const std::string &sKey, const std::string &sValue, MDB_txn *transaction);
+    bool isInTransaction() const;
+    bool startTransaction(TransactionType type = ReadWrite);
+    bool commitTransaction();
+    void abortTransaction();
+    bool write(const std::string &sKey, const std::string &sValue);
     //Perhaps prefer iterators (assuming we need to be able to match multiple values
-    void read(const std::string &sKey, const std::function<void(const std::string)> &);
-
-private:
-    MDB_env *env;
-    MDB_dbi dbi;
-};
-
-/*
- * This opens the db for a single read transaction.
- *
- * The lifetime of all read values is tied to this transaction.
- */
-class ReadTransaction {
-public:
-    ReadTransaction(const QString &path);
-    ~ReadTransaction();
-
+    void read(const std::string &sKey, const std::function<void(const std::string &value)> &);
     void read(const std::string &sKey, const std::function<void(void *ptr, int size)> &);
 
 private:
-    MDB_env *env;
-    MDB_dbi dbi;
-    MDB_txn *txn;
+    class Private;
+    Private * const d;
 };
+