3 files changed, 28 insertions, 3 deletions

diff --git a/common/storage.h b/common/storage.h
index 075fcfd..04e3142 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -68,6 +68,8 @@ public:
               const std::function<bool(void *keyPtr, int keySize, void *ptr, int size)> &resultHandler,
               const std::function<void(const Storage::Error &error)> &errorHandler);
     void remove(void const *keyData, uint keySize);
+    void remove(void const *keyData, uint keySize,
+                const std::function<void(const Storage::Error &error)> &errorHandler);
 
     static std::function<void(const Storage::Error &error)> basicErrorHandler();
     qint64 diskUsage() const;
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 7d06f96..13a6853 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -333,19 +333,28 @@ void Storage::scan(const char *keyData, uint keySize,
 
 void Storage::remove(void const *keyData, uint keySize)
 {
+    remove(keyData, keySize, basicErrorHandler());
+}
+
+void Storage::remove(void const *keyData, uint keySize, const std::function<void(const Storage::Error &error)> &errorHandler)
+{
     if (!d->env) {
+        Error error(d->name.toStdString(), -1, "Not open");
+        errorHandler(error);
         return;
     }
 
     if (d->mode == ReadOnly) {
-        std::cerr << "tried to write in read-only mode." << std::endl;
+        Error error(d->name.toStdString(), -3, "Tried to write in read-only mode");
+        errorHandler(error);
         return;
     }
 
     const bool implicitTransaction = !d->transaction || d->readTransaction;
     if (implicitTransaction) {
-        // TODO: if this fails, still try the write below?
         if (!startTransaction()) {
+            Error error(d->name.toStdString(), -2, "Could not start transaction");
+            errorHandler(error);
             return;
         }
     }
@@ -357,7 +366,8 @@ void Storage::remove(void const *keyData, uint keySize)
     rc = mdb_del(d->transaction, d->dbi, &key, 0);
 
     if (rc) {
-        std::cerr << "mdb_del: " << rc << " " << mdb_strerror(rc) << std::endl;
+        Error error(d->name.toStdString(), -1, QString("Error on mdb_del: %1 %2").arg(rc).arg(mdb_strerror(rc)).toStdString());
+        errorHandler(error);
     }
 
     if (implicitTransaction) {
diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index a771042..a405de0 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -120,6 +120,19 @@ private Q_SLOTS:
         storage.removeFromDisk();
     }
 
+    void testTurnReadToWrite()
+    {
+        populate(3);
+        Akonadi2::Storage store(testDataPath, dbName, Akonadi2::Storage::ReadWrite);
+        store.scan("key1", [&](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool {
+            store.remove(keyValue, keySize, [](const Akonadi2::Storage::Error &) {
+                QVERIFY(false);
+            });
+            return false;
+        });
+        store.removeFromDisk();
+    }
+
     void testConcurrentRead()
     {
         const int count = 10000;