X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=b439aefc368761c3530697ab03196f59aabac31e;hp=00dc4c03e41a1ce758dcb40faaf695e25c3a13c5;hb=b49c0a2cb8a2e7225bfa3c5ab00ada6af0673a15;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 00dc4c03..b439aefc 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -20,19 +20,138 @@
 
 #include "sqlitestorage.h"
 
+#include <QtSql>
 
 SqliteStorage::SqliteStorage() {
-  // TODO I don't think that this path is failsafe for windows users :) 
-  QString backlogFile = Global::quasselDir + "/quassel-storage.sqlite";
-  logDb = QSqlDatabase::addDatabase("QSQLITE");
-  logDb.setDatabaseName(backlogFile);
-  bool ok = logDb.open();
-
-  if(!ok) {
-    qWarning(tr("Could not open backlog database: %1").arg(logDb.lastError().text()).toAscii());
-    qWarning(tr("Disabling logging...").toAscii());
-    Q_ASSERT(ok);
-    return;
+  logMessageQuery = NULL;
+  addSenderQuery = NULL;
+  getLastMessageIdQuery = NULL;
+  requestMsgsQuery = NULL;
+  requestMsgsOffsetQuery = NULL;
+  requestMsgsSinceQuery = NULL;
+  requestMsgsSinceOffsetQuery = NULL;
+  requestMsgRangeQuery = NULL;
+  createNetworkQuery = NULL;
+  createBufferQuery = NULL;
+  getBufferInfoQuery = NULL;
+}
+
+SqliteStorage::~SqliteStorage() {
+  if (logMessageQuery) delete logMessageQuery;
+  if (addSenderQuery) delete addSenderQuery;
+  if (getLastMessageIdQuery) delete getLastMessageIdQuery;
+  if (requestMsgsQuery) delete requestMsgsQuery;
+  if (requestMsgsOffsetQuery) delete requestMsgsOffsetQuery;
+  if (requestMsgsSinceQuery) delete requestMsgsSinceQuery;
+  if (requestMsgsSinceOffsetQuery) delete requestMsgsSinceOffsetQuery;
+  if (requestMsgRangeQuery) delete requestMsgRangeQuery;
+  if (createNetworkQuery) delete createNetworkQuery;
+  if (createBufferQuery) delete createBufferQuery;
+  if (getBufferInfoQuery) delete getBufferInfoQuery;
+  
+  logDb.close();
+}
+
+bool SqliteStorage::isAvailable() {
+  if(!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
+  return true;
+}
+
+QString SqliteStorage::displayName() {
+  return QString("SQlite");
+}
+
+bool SqliteStorage::setup(const QVariantMap &settings) {
+  bool ok;
+  // this extra scope is needed to be able to remove the database connection later
+  {
+    logDb = QSqlDatabase::addDatabase("QSQLITE", "quassel_setup");
+    logDb.setDatabaseName(SqliteStorage::backlogFile(true));
+    ok = logDb.open();
+    
+    if (!ok) {
+      qWarning(tr("Could not open backlog database: %1").arg(logDb.lastError().text()).toAscii());
+    } else {
+      logDb.exec("CREATE TABLE quasseluser ("
+	             "userid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "username TEXT UNIQUE NOT NULL,"
+	             "password BLOB NOT NULL)");
+	  
+      logDb.exec("CREATE TABLE sender ("
+	             "senderid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "sender TEXT UNIQUE NOT NULL)");
+	  
+      logDb.exec("CREATE TABLE network ("
+	             "networkid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "userid INTEGER NOT NULL,"
+	             "networkname TEXT NOT NULL,"
+	             "UNIQUE (userid, networkname))");
+	  
+      logDb.exec("CREATE TABLE buffergroup ("
+	             "groupid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "userid INTEGER NOT NULL,"
+	             "displayname TEXT)");
+	  
+      logDb.exec("CREATE TABLE buffer ("
+	             "bufferid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "userid INTEGER NOT NULL,"
+	             "groupid INTEGER,"
+	             "networkid INTEGER NOT NULL,"
+	             "buffername TEXT NOT NULL)");
+	  
+      logDb.exec("CREATE UNIQUE INDEX buffer_idx "
+	             "ON buffer(userid, networkid, buffername)");
+	    
+      logDb.exec("CREATE TABLE backlog ("
+	             "messageid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "time INTEGER NOT NULL,"
+	             "bufferid INTEGER NOT NULL,"
+	             "type INTEGER NOT NULL,"
+	             "flags INTEGER NOT NULL,"
+	             "senderid INTEGER NOT NULL,"
+	             "message TEXT)");
+	  
+      logDb.exec("CREATE TABLE coreinfo ("
+	             "updateid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
+	             "version INTEGER NOT NULL)");
+	  
+      logDb.exec("INSERT INTO coreinfo (version) VALUES (0)");
+      
+      // something fucked up -> no logging possible
+      // FIXME logDb.lastError is reset whenever exec is called
+      if(logDb.lastError().isValid()) { 
+        qWarning(tr("Could not create backlog table: %1").arg(logDb.lastError().text()).toAscii());
+        qWarning(tr("Disabling logging...").toAscii());
+        Q_ASSERT(false); // quassel does require logging
+        ok = false;
+      }
+    
+      logDb.close();
+    }
+  } 
+  
+  QSqlDatabase::removeDatabase("quassel_setup");
+  return ok;
+}
+
+bool SqliteStorage::init(const QVariantMap &settings) {
+  bool ok;
+  // i need the extra scope to be able to remove the database connection
+  {
+    logDb = QSqlDatabase::database("quassel_connection", false);
+    if (!logDb.isValid()) {
+      logDb = QSqlDatabase::addDatabase("QSQLITE", "quassel_connection");
+    }
+    logDb.setDatabaseName(SqliteStorage::backlogFile());
+    ok = logDb.open();
+    if (!ok) {
+      qWarning(tr("Could not open backlog database: %1").arg(logDb.lastError().text()).toAscii());
+    }
+  }
+
+  if (!ok) {
+    //QSqlDatabase::removeDatabase("quassel_connection");
+    return false;
   }
 
   // check if the db schema is up to date
@@ -42,7 +161,8 @@ SqliteStorage::SqliteStorage() {
     //checkVersion(query.value(0));
     qDebug() << "Sqlite is ready. Quassel Schema Version:" << query.value(0).toUInt();
   } else {
-    initDb();
+    qWarning("Sqlite is not ready!");
+    return false;
   }
 
   // we will need those pretty often... so let's speed things up:
@@ -52,10 +172,10 @@ SqliteStorage::SqliteStorage() {
   createNetworkQuery = new QSqlQuery(logDb);
   createNetworkQuery->prepare("INSERT INTO network (userid, networkname) VALUES (:userid, :networkname)");
 
-  getBufferIdQuery = new QSqlQuery(logDb);
-  getBufferIdQuery->prepare("SELECT bufferid FROM buffer "
+  getBufferInfoQuery = new QSqlQuery(logDb);
+  getBufferInfoQuery->prepare("SELECT bufferid FROM buffer "
                             "JOIN network ON buffer.networkid = network.networkid "
-                            "WHERE network.networkname = :networkname AND buffer.userid = :userid AND buffer.buffername = :buffername ");
+                            "WHERE network.networkname = :networkname AND buffer.userid = :userid AND lower(buffer.buffername) = lower(:buffername)");
 
   logMessageQuery = new QSqlQuery(logDb);
   logMessageQuery->prepare("INSERT INTO backlog (time, bufferid, type, flags, senderid, message) "
@@ -104,92 +224,11 @@ SqliteStorage::SqliteStorage() {
                                 "WHERE (buffer.bufferid = :bufferid OR buffer.groupid = (SELECT groupid FROM buffer WHERE bufferid = :bufferid2)) AND "
                                 "backlog.messageid >= :firstmsg AND backlog.messageid <= :lastmsg "
                                 "ORDER BY messageid DESC ");
-
-}
-
-SqliteStorage::~SqliteStorage() {
-  delete logMessageQuery;
-  delete addSenderQuery;
-  delete getLastMessageIdQuery;
-  delete requestMsgsQuery;
-  delete requestMsgsOffsetQuery;
-  delete requestMsgsSinceQuery;
-  delete requestMsgsSinceOffsetQuery;
-  delete requestMsgRangeQuery;
-  delete createNetworkQuery;
-  delete createBufferQuery;
-  delete getBufferIdQuery;
-  logDb.close();
-}
-
-
-void SqliteStorage::initDb() {
-  logDb.exec("CREATE TABLE quasseluser ("
-             "userid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "username TEXT UNIQUE NOT NULL,"
-             "password BLOB NOT NULL)");
   
-  logDb.exec("CREATE TABLE sender ("
-             "senderid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "sender TEXT UNIQUE NOT NULL)");
-  
-  logDb.exec("CREATE TABLE network ("
-             "networkid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "userid INTEGER NOT NULL,"
-             "networkname TEXT NOT NULL,"
-             "UNIQUE (userid, networkname))");
-  
-  logDb.exec("CREATE TABLE buffergroup ("
-             "groupid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "userid INTEGER NOT NULL,"
-             "displayname TEXT)");
-  
-  logDb.exec("CREATE TABLE buffer ("
-             "bufferid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "userid INTEGER NOT NULL,"
-             "groupid INTEGER,"
-             "networkid INTEGER NOT NULL,"
-             "buffername TEXT NOT NULL)");
-  
-  logDb.exec("CREATE UNIQUE INDEX buffer_idx "
-             "ON buffer(userid, networkid, buffername)");
-    
-  logDb.exec("CREATE TABLE backlog ("
-             "messageid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "time INTEGER NOT NULL,"
-             "bufferid INTEGER NOT NULL,"
-             "type INTEGER NOT NULL,"
-             "flags INTEGER NOT NULL,"
-             "senderid INTEGER NOT NULL,"
-             "message TEXT NOT NULL)");
-  
-  logDb.exec("CREATE TABLE coreinfo ("
-             "updateid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-             "version INTEGER NOT NULL)");
-  
-  logDb.exec("INSERT INTO coreinfo (version) VALUES (0)");
-
-
-  // something fucked up -> no logging possible
-  // FIXME logDb.lastError is reset whenever exec is called
-  if(logDb.lastError().isValid()) { 
-    qWarning(tr("Could not create backlog table: %1").arg(logDb.lastError().text()).toAscii());
-    qWarning(tr("Disabling logging...").toAscii());
-    Q_ASSERT(false); // quassel does require logging
-  }
-}
-
-bool SqliteStorage::isAvailable() {
-  if(!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
   return true;
 }
 
-QString SqliteStorage::displayName() {
-  // I think the class name is a good start here
-  return QString("SqliteStorage");
-}
-
-UserId SqliteStorage::addUser(QString user, QString password) {
+UserId SqliteStorage::addUser(const QString &user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
@@ -200,16 +239,18 @@ UserId SqliteStorage::addUser(QString user, QString password) {
   query.exec();
   if(query.lastError().isValid() && query.lastError().number() == 19) { // user already exists - sadly 19 seems to be the general constraint violation error...
     return 0;
-  } 
+  }
 
   query.prepare("SELECT userid FROM quasseluser WHERE username = :username");
   query.bindValue(":username", user);
   query.exec();
   query.first();
-  return query.value(0).toUInt();
+  UserId uid = query.value(0).toUInt();
+  emit userAdded(uid, user);
+  return uid;
 }
 
-void SqliteStorage::updateUser(UserId user, QString password) {
+void SqliteStorage::updateUser(UserId user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
@@ -220,7 +261,16 @@ void SqliteStorage::updateUser(UserId user, QString password) {
   query.exec();
 }
 
-UserId SqliteStorage::validateUser(QString user, QString password) {
+void SqliteStorage::renameUser(UserId user, const QString &newName) {
+  QSqlQuery query(logDb);
+  query.prepare("UPDATE quasseluser SET username = :username WHERE userid = :userid");
+  query.bindValue(":userid", user);
+  query.bindValue(":username", newName);
+  query.exec();
+  emit userRenamed(user, newName);
+}
+
+UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
@@ -256,9 +306,10 @@ void SqliteStorage::delUser(UserId user) {
   query.bindValue(":userid", user);
   query.exec();
   // I hate the lack of foreign keys and on delete cascade... :(
+  emit userRemoved(user);
 }
 
-void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) {
+void SqliteStorage::createBuffer(UserId user, const QString &network, const QString &buffer) {
   createBufferQuery->bindValue(":userid", user);
   createBufferQuery->bindValue(":networkname", network);
   createBufferQuery->bindValue(":buffername", buffer);
@@ -280,31 +331,55 @@ void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) {
   }
 }
 
-BufferId SqliteStorage::getBufferId(UserId user, QString network, QString buffer) {
-  BufferId bufferid;
-  getBufferIdQuery->bindValue(":networkname", network);
-  getBufferIdQuery->bindValue(":userid", user);
-  getBufferIdQuery->bindValue(":buffername", buffer);
-  getBufferIdQuery->exec();
+uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
+  QSqlQuery query(logDb);
+  query.prepare("SELECT networkid FROM network "
+		"WHERE userid = :userid AND networkname = :networkname");
+  query.bindValue(":userid", user);
+  query.bindValue(":networkname", network);
+  query.exec();
+  
+  if(query.first())
+    return query.value(0).toUInt();
+  else {
+    createBuffer(user, network, "");
+    query.exec();
+    if(query.first())
+      return query.value(0).toUInt();
+    else {
+      qWarning() << "NETWORK NOT FOUND:" << network << "for User:" << user;
+      return 0;
+    }
+  }
+}
 
-  if(!getBufferIdQuery->first()) {
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
+  BufferInfo bufferid;
+  // TODO: get rid of this hackaround
+  uint networkId = getNetworkId(user, network);
+  getBufferInfoQuery->bindValue(":networkname", network);
+  getBufferInfoQuery->bindValue(":userid", user);
+  getBufferInfoQuery->bindValue(":buffername", buffer);
+  getBufferInfoQuery->exec();
+
+  if(!getBufferInfoQuery->first()) {
     createBuffer(user, network, buffer);
-    getBufferIdQuery->exec();
-    if(getBufferIdQuery->first()) {
-      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
-      emit bufferIdUpdated(bufferid);
+    getBufferInfoQuery->exec();
+    if(getBufferInfoQuery->first()) {
+      bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
+      emit bufferInfoUpdated(bufferid);
     }
   } else {
-    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+    bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
   }
 
-  Q_ASSERT(!getBufferIdQuery->next());
+  Q_ASSERT(!getBufferInfoQuery->next());
 
   return bufferid;
 }
 
-QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
-  QList<BufferId> bufferlist;
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
+  QList<BufferInfo> bufferlist;
   QSqlQuery query(logDb);
   query.prepare("SELECT DISTINCT buffer.bufferid, networkname, buffername FROM buffer "
                 "JOIN network ON buffer.networkid = network.networkid "
@@ -320,48 +395,50 @@ QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
   query.exec();
 
   while(query.next()) {
-    bufferlist << BufferId(query.value(0).toUInt(), query.value(1).toString(), query.value(2).toString());
+    bufferlist << BufferInfo(query.value(0).toUInt(), getNetworkId(user, query.value(1).toString()), 0, query.value(1).toString(), query.value(2).toString());
   }
   return bufferlist;
 }
 
 MsgId SqliteStorage::logMessage(Message msg) {
-  logMessageQuery->bindValue(":time", msg.timeStamp.toTime_t());
-  logMessageQuery->bindValue(":bufferid", msg.buffer.uid());
-  logMessageQuery->bindValue(":type", msg.type);
-  logMessageQuery->bindValue(":flags", msg.flags);
-  logMessageQuery->bindValue(":sender", msg.sender);
-  logMessageQuery->bindValue(":message", msg.text);
+  logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
+  logMessageQuery->bindValue(":bufferid", msg.buffer().uid());
+  logMessageQuery->bindValue(":type", msg.type());
+  logMessageQuery->bindValue(":flags", msg.flags());
+  logMessageQuery->bindValue(":sender", msg.sender());
+  logMessageQuery->bindValue(":message", msg.text());
   logMessageQuery->exec();
   
   if(logMessageQuery->lastError().isValid()) {
     // constraint violation - must be NOT NULL constraint - probably the sender is missing...
     if(logMessageQuery->lastError().number() == 19) { 
-      addSenderQuery->bindValue(":sender", msg.sender);
+      addSenderQuery->bindValue(":sender", msg.sender());
       addSenderQuery->exec();
+      watchQuery(addSenderQuery);
       logMessageQuery->exec();
-      Q_ASSERT(!logMessageQuery->lastError().isValid());
+      if(!watchQuery(logMessageQuery))
+	return 0;
     } else {
-      qDebug() << "unhandled DB Error in logMessage(): Number:" << logMessageQuery->lastError().number() << "ErrMsg:" << logMessageQuery->lastError().text();
+      watchQuery(logMessageQuery);
     }
   }
 
-  getLastMessageIdQuery->bindValue(":time", msg.timeStamp.toTime_t());
-  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer.uid());
-  getLastMessageIdQuery->bindValue(":type", msg.type);
-  getLastMessageIdQuery->bindValue(":sender", msg.sender);
+  getLastMessageIdQuery->bindValue(":time", msg.timestamp().toTime_t());
+  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid());
+  getLastMessageIdQuery->bindValue(":type", msg.type());
+  getLastMessageIdQuery->bindValue(":sender", msg.sender());
   getLastMessageIdQuery->exec();
 
   if(getLastMessageIdQuery->first()) {
     return getLastMessageIdQuery->value(0).toUInt();
   } else { // somethin went wrong... :(
-    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timeStamp.toTime_t() << msg.buffer.uid() << msg.type << msg.sender;
+    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timestamp().toTime_t() << msg.buffer().uid() << msg.type() << msg.sender();
     Q_ASSERT(false);
     return 0;
   }
 }
 
-QList<Message> SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int offset) {
+QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
   QList<Message> messagelist;
   // we have to determine the real offset first
   requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid());
@@ -383,14 +460,14 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int off
                 requestMsgsQuery->value(5).toString(),
                 requestMsgsQuery->value(4).toString(),
                 requestMsgsQuery->value(3).toUInt());
-    msg.msgId = requestMsgsQuery->value(0).toUInt();
+    msg.setMsgId(requestMsgsQuery->value(0).toUInt());
     messagelist << msg;
   }
   return messagelist;
 }
 
 
-QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int offset) {
+QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
   QList<Message> messagelist;
   // we have to determine the real offset first
   requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid());
@@ -413,7 +490,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int
                 requestMsgsSinceQuery->value(5).toString(),
                 requestMsgsSinceQuery->value(4).toString(),
                 requestMsgsSinceQuery->value(3).toUInt());
-    msg.msgId = requestMsgsSinceQuery->value(0).toUInt();
+    msg.setMsgId(requestMsgsSinceQuery->value(0).toUInt());
     messagelist << msg;
   }
 
@@ -421,7 +498,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int
 }
 
 
-QList<Message> SqliteStorage::requestMsgRange(BufferId buffer, int first, int last) {
+QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
   QList<Message> messagelist;
   requestMsgRangeQuery->bindValue(":bufferid", buffer.uid());
   requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid());
@@ -435,42 +512,44 @@ QList<Message> SqliteStorage::requestMsgRange(BufferId buffer, int first, int la
                 requestMsgRangeQuery->value(5).toString(),
                 requestMsgRangeQuery->value(4).toString(),
                 requestMsgRangeQuery->value(3).toUInt());
-    msg.msgId = requestMsgRangeQuery->value(0).toUInt();
+    msg.setMsgId(requestMsgRangeQuery->value(0).toUInt());
     messagelist << msg;
   }
 
   return messagelist;
 }
 
-void SqliteStorage::importOldBacklog() {
-  QSqlQuery query(logDb);
-  int user;
-  query.prepare("SELECT MIN(userid) FROM quasseluser");
-  query.exec();
-  if(!query.first()) {
-    qDebug() << "create a user first!";
-  } else {
-    user = query.value(0).toUInt();
+QString SqliteStorage::backlogFile(bool createPath) {
+  // kinda ugly, but I currently see no other way to do that
+#ifdef _WINDOWS
+  QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "\\quassel\\";
+#else
+  QString quasselDir = QDir::homePath() + "/.quassel/";
+#endif
+  
+  if (createPath) {
+    QDir *qDir = new QDir(quasselDir);
+    if (!qDir->exists(quasselDir)) {
+      qDir->mkpath(quasselDir);
+    }
+    delete qDir;
   }
-  query.prepare("DELETE FROM backlog WHERE bufferid IN (SELECT DISTINCT bufferid FROM buffer WHERE userid = :userid");
-  query.bindValue(":userid", user);
-  query.exec();
-  query.prepare("DELETE FROM buffer WHERE userid = :userid");
-  query.bindValue(":userid", user);
-  query.exec();
-  query.prepare("DELETE FROM buffergroup WHERE userid = :userid");
-  query.bindValue(":userid", user);
-  query.exec();
-  query.prepare("DELETE FROM network WHERE userid = :userid");
-  query.bindValue(":userid", user);
-  query.exec();
-  logDb.commit();
-  qDebug() << "All userdata has been deleted";
-  qDebug() << "importing old backlog files...";
-  initBackLogOld(user);
-  logDb.commit();
-  return;
-}
-
 
+  return quasselDir + "quassel-storage.sqlite";
+}
 
+bool SqliteStorage::watchQuery(QSqlQuery *query) {
+  if(query->lastError().isValid()) {
+    qWarning() << "unhandled Error in QSqlQuery!";
+    qWarning() << "                  last Query:" << query->lastQuery();
+    qWarning() << "              executed Query:" << query->executedQuery();
+    qWarning() << "                bound Values:" << query->boundValues();
+    qWarning() << "                Error Number:" << query->lastError().number();
+    qWarning() << "               Error Message:" << query->lastError().text();
+    qWarning() << "              Driver Message:" << query->lastError().driverText();
+    qWarning() << "                  DB Message:" << query->lastError().databaseText();
+    
+    return false;
+  }
+  return true;
+}