making away state and user modes persistent
[quassel.git] / src / core / sqlitestorage.cpp
index 21d67cd..003d57a 100644 (file)
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 
 #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;
-  }
+#include "logger.h"
+#include "network.h"
+#include "quassel.h"
 
-  // check if the db schema is up to date
-  QSqlQuery query = logDb.exec("SELECT MAX(version) FROM coreinfo");
-  if(query.first()) {
-    // TODO VersionCheck
-    //checkVersion(query.value(0));
-    qDebug() << "Sqlite is ready. Quassel Schema Version:" << query.value(0).toUInt();
-  } else {
-    initDb();
-  }
-
-  // we will need those pretty often... so let's speed things up:
-  createBufferQuery = new QSqlQuery(logDb);
-  createBufferQuery->prepare("INSERT INTO buffer (userid, networkid, buffername) VALUES (:userid, (SELECT networkid FROM network WHERE networkname = :networkname), :buffername)");
-
-  createNetworkQuery = new QSqlQuery(logDb);
-  createNetworkQuery->prepare("INSERT INTO network (userid, networkname) VALUES (:userid, :networkname)");
-
-  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 ");
-
-  logMessageQuery = new QSqlQuery(logDb);
-  logMessageQuery->prepare("INSERT INTO backlog (time, bufferid, type, flags, senderid, message) "
-                           "VALUES (:time, :bufferid, :type, :flags, (SELECT senderid FROM sender WHERE sender = :sender), :message)");
-
-  addSenderQuery = new QSqlQuery(logDb);
-  addSenderQuery->prepare("INSERT INTO sender (sender) VALUES (:sender)");
-
-  getLastMessageIdQuery = new QSqlQuery(logDb);
-  getLastMessageIdQuery->prepare("SELECT messageid FROM backlog "
-                                 "WHERE time = :time AND bufferid = :bufferid AND type = :type AND senderid = (SELECT senderid FROM sender WHERE sender = :sender)");
-
-  requestMsgsOffsetQuery = new QSqlQuery(logDb);
-  requestMsgsOffsetQuery->prepare("SELECT count(*) FROM backlog WHERE bufferid = :bufferid AND messageid < :messageid");
-
-  requestMsgsQuery = new QSqlQuery(logDb);
-  requestMsgsQuery->prepare("SELECT messageid, time,  type, flags, sender, message, displayname "
-                            "FROM backlog "
-                            "JOIN buffer ON backlog.bufferid = buffer.bufferid "
-                            "JOIN sender ON backlog.senderid = sender.senderid "
-                            "LEFT JOIN buffergroup ON buffer.groupid = buffergroup.groupid "
-                            "WHERE buffer.bufferid = :bufferid OR buffer.groupid = (SELECT groupid FROM buffer WHERE bufferid = :bufferid2) "
-                            "ORDER BY messageid DESC "
-                            "LIMIT :limit OFFSET :offset");
-
-  requestMsgsSinceOffsetQuery = new QSqlQuery(logDb);
-  requestMsgsSinceOffsetQuery->prepare("SELECT count(*) FROM backlog WHERE bufferid = :bufferid AND time >= :since");
-
-  requestMsgsSinceQuery = new QSqlQuery(logDb);
-  requestMsgsSinceQuery->prepare("SELECT messageid, time,  type, flags, sender, message, displayname "
-                                 "FROM backlog "
-                                 "JOIN buffer ON backlog.bufferid = buffer.bufferid "
-                                 "JOIN sender ON backlog.senderid = sender.senderid "
-                                 "LEFT JOIN buffergroup ON buffer.groupid = buffergroup.groupid "
-                                 "WHERE (buffer.bufferid = :bufferid OR buffer.groupid = (SELECT groupid FROM buffer WHERE bufferid = :bufferid2)) AND "
-                                 "backlog.time >= :since "
-                                 "ORDER BY messageid DESC "
-                                 "LIMIT -1 OFFSET :offset");
-
-  requestMsgRangeQuery = new QSqlQuery(logDb);
-  requestMsgRangeQuery->prepare("SELECT messageid, time,  type, flags, sender, message, displayname "
-                                "FROM backlog "
-                                "JOIN buffer ON backlog.bufferid = buffer.bufferid "
-                                "JOIN sender ON backlog.senderid = sender.senderid "
-                                "LEFT JOIN buffergroup ON buffer.groupid = buffergroup.groupid "
-                                "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 ");
+int SqliteStorage::_maxRetryCount = 150; // yes this is a large number... only other way to "handle" this is bailing out...
 
+SqliteStorage::SqliteStorage(QObject *parent)
+  : AbstractSqlStorage(parent)
+{
 }
 
 SqliteStorage::~SqliteStorage() {
-  //logDb.close();
-  delete logMessageQuery;
-  delete addSenderQuery;
-  delete getLastMessageIdQuery;
-  delete requestMsgsQuery;
-  delete requestMsgsOffsetQuery;
-  delete requestMsgsSinceQuery;
-  delete requestMsgsSinceOffsetQuery;
-  delete requestMsgRangeQuery;
-  delete createNetworkQuery;
-  delete createBufferQuery;
-  delete getBufferInfoQuery;
-  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)");
+}
 
+bool SqliteStorage::isAvailable() const {
+  if(!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
+  return true;
+}
 
-  // 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
-  }
+QString SqliteStorage::displayName() const {
+  return QString("SQLite");
+}
 
-  addUser("Default", "password");
+QString SqliteStorage::description() const {
+  return tr("SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized "
+            "databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine "
+            "it is running on, and if you only expect a few users to use your core.");
 }
 
-bool SqliteStorage::isAvailable() {
-  if(!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
-  return true;
+int SqliteStorage::installedSchemaVersion() {
+  QSqlQuery query = logDb().exec("SELECT value FROM coreinfo WHERE key = 'schemaversion'");
+  if(query.first())
+    return query.value(0).toInt();
+
+  // maybe it's really old... (schema version 0)
+  query = logDb().exec("SELECT MAX(version) FROM coreinfo");
+  if(query.first())
+    return query.value(0).toInt();
+
+  return AbstractSqlStorage::installedSchemaVersion();
 }
 
-QString SqliteStorage::displayName() {
-  return QString("SqliteStorage");
+bool SqliteStorage::updateSchemaVersion(int newVersion) {
+  QSqlQuery query(logDb());
+  query.prepare("UPDATE coreinfo SET value = :version WHERE key = 'schemaversion'");
+  query.bindValue(":version", newVersion);
+  query.exec();
+
+  bool success = true;
+  if(query.lastError().isValid()) {
+    qCritical() << "SqliteStorage::updateSchemaVersion(int): Updating schema version failed!";
+    success = false;
+  }
+  return success;
 }
 
-UserId SqliteStorage::addUser(const QString &user, const QString &password) {
-  QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
-  cryptopass = cryptopass.toHex();
+bool SqliteStorage::setupSchemaVersion(int version) {
+  QSqlQuery query(logDb());
+  query.prepare("INSERT INTO coreinfo (key, value) VALUES ('schemaversion', :version)");
+  query.bindValue(":version", version);
+  query.exec();
 
-  QSqlQuery query(logDb);
-  query.prepare("INSERT INTO quasseluser (username, password) VALUES (:username, :password)");
+  bool success = true;
+  if(query.lastError().isValid()) {
+    qCritical() << "SqliteStorage::setupSchemaVersion(int): Updating schema version failed!";
+    success = false;
+  }
+  return success;
+}
+
+UserId SqliteStorage::addUser(const QString &user, const QString &password) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("insert_quasseluser"));
   query.bindValue(":username", user);
-  query.bindValue(":password", cryptopass);
-  query.exec();
+  query.bindValue(":password", cryptedPassword(password));
+  safeExec(query);
   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.prepare(queryString("select_userid"));
   query.bindValue(":username", user);
-  query.exec();
+  safeExec(query);
   query.first();
-  UserId uid = query.value(0).toUInt();
+  UserId uid = query.value(0).toInt();
   emit userAdded(uid, user);
   return uid;
 }
 
 void SqliteStorage::updateUser(UserId user, const QString &password) {
-  QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
-  cryptopass = cryptopass.toHex();
-
-  QSqlQuery query(logDb);
-  query.prepare("UPDATE quasseluser SET password = :password WHERE userid = :userid");
-  query.bindValue(":userid", user);
-  query.bindValue(":password", cryptopass);
-  query.exec();
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_userpassword"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":password", cryptedPassword(password));
+  safeExec(query);
 }
 
 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);
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_username"));
+  query.bindValue(":userid", user.toInt());
   query.bindValue(":username", newName);
-  query.exec();
+  safeExec(query);
   emit userRenamed(user, newName);
 }
 
 UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
-  QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
-  cryptopass = cryptopass.toHex();
-
-  QSqlQuery query(logDb);
-  query.prepare("SELECT userid FROM quasseluser WHERE username = :username AND password = :password");
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_authuser"));
   query.bindValue(":username", user);
-  query.bindValue(":password", cryptopass);
-  query.exec();
+  query.bindValue(":password", cryptedPassword(password));
+  safeExec(query);
+
+  if(query.first()) {
+    return query.value(0).toInt();
+  } else {
+    return 0;
+  }
+}
+
+UserId SqliteStorage::internalUser() {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_internaluser"));
+  safeExec(query);
 
   if(query.first()) {
-    return query.value(0).toUInt();
+    return query.value(0).toInt();
   } else {
-    throw AuthError();
-    //return 0;
+    return 0;
   }
 }
 
 void SqliteStorage::delUser(UserId user) {
-  QSqlQuery query(logDb);
-  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();
-  query.prepare("DELETE FROM quasseluser WHERE userid = :userid");
-  query.bindValue(":userid", user);
-  query.exec();
+  QSqlQuery query(logDb());
+  query.prepare(queryString("delete_backlog_by_uid"));
+  query.bindValue(":userid", user.toInt());
+  safeExec(query);
+
+  query.prepare(queryString("delete_buffers_by_uid"));
+  query.bindValue(":userid", user.toInt());
+  safeExec(query);
+
+  query.prepare(queryString("delete_networks_by_uid"));
+  query.bindValue(":userid", user.toInt());
+  safeExec(query);
+
+  query.prepare(queryString("delete_quasseluser"));
+  query.bindValue(":userid", user.toInt());
+  safeExec(query);
   // I hate the lack of foreign keys and on delete cascade... :(
   emit userRemoved(user);
 }
 
-void SqliteStorage::createBuffer(UserId user, const QString &network, const QString &buffer) {
-  createBufferQuery->bindValue(":userid", user);
-  createBufferQuery->bindValue(":networkname", network);
-  createBufferQuery->bindValue(":buffername", buffer);
-  createBufferQuery->exec();
-
-  if(createBufferQuery->lastError().isValid()) {
-    if(createBufferQuery->lastError().number() == 19) { // Null Constraint violation 
-      createNetworkQuery->bindValue(":userid", user);
-      createNetworkQuery->bindValue(":networkname", network);
-      createNetworkQuery->exec();
-      createBufferQuery->exec();
-      Q_ASSERT(!createNetworkQuery->lastError().isValid());
-      Q_ASSERT(!createBufferQuery->lastError().isValid());
-    } else {
-      // do panic!
-      qDebug() << "failed to create Buffer: ErrNo:" << createBufferQuery->lastError().number() << "ErrMsg:" << createBufferQuery->lastError().text();
-      Q_ASSERT(false);
+void SqliteStorage::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) {
+  QByteArray rawData;
+  QDataStream out(&rawData, QIODevice::WriteOnly);
+  out.setVersion(QDataStream::Qt_4_2);
+  out << data;
+
+  QSqlQuery query(logDb());
+  query.prepare(queryString("insert_user_setting"));
+  query.bindValue(":userid", userId.toInt());
+  query.bindValue(":settingname", settingName);
+  query.bindValue(":settingvalue", rawData);
+  safeExec(query);
+
+  if(query.lastError().isValid()) {
+    QSqlQuery updateQuery(logDb());
+    updateQuery.prepare(queryString("update_user_setting"));
+    updateQuery.bindValue(":userid", userId.toInt());
+    updateQuery.bindValue(":settingname", settingName);
+    updateQuery.bindValue(":settingvalue", rawData);
+    safeExec(updateQuery);
+  }
+
+}
+
+QVariant SqliteStorage::getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_user_setting"));
+  query.bindValue(":userid", userId.toInt());
+  query.bindValue(":settingname", settingName);
+  safeExec(query);
+
+  if(query.first()) {
+    QVariant data;
+    QByteArray rawData = query.value(0).toByteArray();
+    QDataStream in(&rawData, QIODevice::ReadOnly);
+    in.setVersion(QDataStream::Qt_4_2);
+    in >> data;
+    return data;
+  } else {
+    return defaultData;
+  }
+}
+
+IdentityId SqliteStorage::createIdentity(UserId user, CoreIdentity &identity) {
+  IdentityId identityId;
+
+  QSqlQuery query(logDb());
+  query.prepare(queryString("insert_identity"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":identityname", identity.identityName());
+  query.bindValue(":realname", identity.realName());
+  query.bindValue(":awaynick", identity.awayNick());
+  query.bindValue(":awaynickenabled", identity.awayNickEnabled() ? 1 : 0);
+  query.bindValue(":awayreason", identity.awayReason());
+  query.bindValue(":awayreasonenabled", identity.awayReasonEnabled() ? 1 : 0);
+  query.bindValue(":autoawayenabled", identity.awayReasonEnabled() ? 1 : 0);
+  query.bindValue(":autoawaytime", identity.autoAwayTime());
+  query.bindValue(":autoawayreason", identity.autoAwayReason());
+  query.bindValue(":autoawayreasonenabled", identity.autoAwayReasonEnabled() ? 1 : 0);
+  query.bindValue(":detachawayenabled", identity.detachAwayEnabled() ? 1 : 0);
+  query.bindValue(":detachawayreason", identity.detachAwayReason());
+  query.bindValue(":detachawayreasonenabled", identity.detachAwayReasonEnabled() ? 1 : 0);
+  query.bindValue(":ident", identity.ident());
+  query.bindValue(":kickreason", identity.kickReason());
+  query.bindValue(":partreason", identity.partReason());
+  query.bindValue(":quitreason", identity.quitReason());
+#ifdef HAVE_SSL
+  query.bindValue(":sslcert", identity.sslCert().toPem());
+  query.bindValue(":sslkey", identity.sslKey().toPem());
+#else
+  query.bindValue(":sslcert", QByteArray());
+  query.bindValue(":sslkey", QByteArray());
+#endif
+
+  safeExec(query);
+
+  identityId = query.lastInsertId().toInt();
+  if(!identityId.isValid()) {
+    watchQuery(query);
+  } else {
+    QSqlQuery deleteNickQuery(logDb());
+    deleteNickQuery.prepare(queryString("delete_nicks"));
+    deleteNickQuery.bindValue(":identityid", identityId.toInt());
+    safeExec(deleteNickQuery);
+
+    QSqlQuery insertNickQuery(logDb());
+    insertNickQuery.prepare(queryString("insert_nick"));
+    foreach(QString nick, identity.nicks()) {
+      insertNickQuery.bindValue(":identityid", identityId.toInt());
+      insertNickQuery.bindValue(":nick", nick);
+      safeExec(insertNickQuery);
+    }
+  }
+  identity.setId(identityId);
+  return identityId;
+}
+
+bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity &identity) {
+  QSqlQuery checkQuery(logDb());
+  checkQuery.prepare(queryString("select_checkidentity"));
+  checkQuery.bindValue(":identityid", identity.id().toInt());
+  checkQuery.bindValue(":userid", user.toInt());
+  safeExec(checkQuery);
+
+  if(!checkQuery.first() || checkQuery.value(0).toInt() != 1) // there should be exactly one identity for the given id and user
+    return false;
+
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_identity"));
+  query.bindValue(":identityname", identity.identityName());
+  query.bindValue(":realname", identity.realName());
+  query.bindValue(":awaynick", identity.awayNick());
+  query.bindValue(":awaynickenabled", identity.awayNickEnabled() ? 1 : 0);
+  query.bindValue(":awayreason", identity.awayReason());
+  query.bindValue(":awayreasonenabled", identity.awayReasonEnabled() ? 1 : 0);
+  query.bindValue(":autoawayenabled", identity.awayReasonEnabled() ? 1 : 0);
+  query.bindValue(":autoawaytime", identity.autoAwayTime());
+  query.bindValue(":autoawayreason", identity.autoAwayReason());
+  query.bindValue(":autoawayreasonenabled", identity.autoAwayReasonEnabled() ? 1 : 0);
+  query.bindValue(":detachawayenabled", identity.detachAwayEnabled() ? 1 : 0);
+  query.bindValue(":detachawayreason", identity.detachAwayReason());
+  query.bindValue(":detachawayreasonenabled", identity.detachAwayReasonEnabled() ? 1 : 0);
+  query.bindValue(":ident", identity.ident());
+  query.bindValue(":kickreason", identity.kickReason());
+  query.bindValue(":partreason", identity.partReason());
+  query.bindValue(":quitreason", identity.quitReason());
+#ifdef HAVE_SSL
+  query.bindValue(":sslcert", identity.sslCert().toPem());
+  query.bindValue(":sslkey", identity.sslKey().toPem());
+#else
+  query.bindValue(":sslcert", QByteArray());
+  query.bindValue(":sslkey", QByteArray());
+#endif
+  query.bindValue(":identityid", identity.id().toInt());
+  safeExec(query);
+  watchQuery(query);
+
+  QSqlQuery deleteNickQuery(logDb());
+  deleteNickQuery.prepare(queryString("delete_nicks"));
+  deleteNickQuery.bindValue(":identityid", identity.id().toInt());
+  safeExec(deleteNickQuery);
+  watchQuery(deleteNickQuery);
+
+  QSqlQuery insertNickQuery(logDb());
+  insertNickQuery.prepare(queryString("insert_nick"));
+  foreach(QString nick, identity.nicks()) {
+    insertNickQuery.bindValue(":identityid", identity.id().toInt());
+    insertNickQuery.bindValue(":nick", nick);
+    safeExec(insertNickQuery);
+    watchQuery(insertNickQuery);
+  }
+
+  return true;
+}
+
+void SqliteStorage::removeIdentity(UserId user, IdentityId identityId) {
+  QSqlQuery checkQuery(logDb());
+  checkQuery.prepare(queryString("select_checkidentity"));
+  checkQuery.bindValue(":identityid", identityId.toInt());
+  checkQuery.bindValue(":userid", user.toInt());
+  safeExec(checkQuery);
+
+  if(!checkQuery.first() || checkQuery.value(0).toInt() != 1) // there should be exactly one identity for the given id and user
+    return;
+
+  QSqlQuery deleteNickQuery(logDb());
+  deleteNickQuery.prepare(queryString("delete_nicks"));
+  deleteNickQuery.bindValue(":identityid", identityId.toInt());
+  safeExec(deleteNickQuery);
+
+  QSqlQuery deleteIdentityQuery(logDb());
+  deleteIdentityQuery.prepare(queryString("delete_identity"));
+  deleteIdentityQuery.bindValue(":identityid", identityId.toInt());
+  deleteIdentityQuery.bindValue(":userid", user.toInt());
+  safeExec(deleteIdentityQuery);
+}
+
+QList<CoreIdentity> SqliteStorage::identities(UserId user) {
+  QList<CoreIdentity> identities;
+
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_identities"));
+  query.bindValue(":userid", user.toInt());
+
+  QSqlQuery nickQuery(logDb());
+  nickQuery.prepare(queryString("select_nicks"));
+
+  safeExec(query);
+
+  while(query.next()) {
+    CoreIdentity identity(IdentityId(query.value(0).toInt()));
+
+    identity.setIdentityName(query.value(1).toString());
+    identity.setRealName(query.value(2).toString());
+    identity.setAwayNick(query.value(3).toString());
+    identity.setAwayNickEnabled(!!query.value(4).toInt());
+    identity.setAwayReason(query.value(5).toString());
+    identity.setAwayReasonEnabled(!!query.value(6).toInt());
+    identity.setAutoAwayEnabled(!!query.value(7).toInt());
+    identity.setAutoAwayTime(query.value(8).toInt());
+    identity.setAutoAwayReason(query.value(9).toString());
+    identity.setAutoAwayReasonEnabled(!!query.value(10).toInt());
+    identity.setDetachAwayEnabled(!!query.value(11).toInt());
+    identity.setDetachAwayReason(query.value(12).toString());
+    identity.setDetachAwayReasonEnabled(!!query.value(13).toInt());
+    identity.setIdent(query.value(14).toString());
+    identity.setKickReason(query.value(15).toString());
+    identity.setPartReason(query.value(16).toString());
+    identity.setQuitReason(query.value(17).toString());
+#ifdef HAVE_SSL
+    identity.setSslCert(query.value(18).toByteArray());
+    identity.setSslKey(query.value(19).toByteArray());
+#endif
+
+    nickQuery.bindValue(":identityid", identity.id().toInt());
+    QList<QString> nicks;
+    safeExec(nickQuery);
+    watchQuery(nickQuery);
+    while(nickQuery.next()) {
+      nicks << nickQuery.value(0).toString();
+    }
+    identity.setNicks(nicks);
+    identities << identity;
+  }
+  return identities;
+}
+
+NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) {
+  NetworkId networkId;
+  QSqlQuery query(logDb());
+  query.prepare(queryString("insert_network"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkname", info.networkName);
+  safeExec(query);
+
+  networkId = getNetworkId(user, info.networkName);
+  if(!networkId.isValid()) {
+    watchQuery(query);
+  } else {
+    NetworkInfo newNetworkInfo = info;
+    newNetworkInfo.networkId = networkId;
+    updateNetwork(user, newNetworkInfo);
+  }
+  return networkId;
+}
+
+bool SqliteStorage::updateNetwork(UserId user, const NetworkInfo &info) {
+  if(!isValidNetwork(user, info.networkId))
+     return false;
+
+  QSqlQuery updateQuery(logDb());
+  updateQuery.prepare(queryString("update_network"));
+  updateQuery.bindValue(":networkname", info.networkName);
+  updateQuery.bindValue(":identityid", info.identity.toInt());
+  updateQuery.bindValue(":usecustomencoding", info.useCustomEncodings ? 1 : 0);
+  updateQuery.bindValue(":encodingcodec", QString(info.codecForEncoding));
+  updateQuery.bindValue(":decodingcodec", QString(info.codecForDecoding));
+  updateQuery.bindValue(":servercodec", QString(info.codecForServer));
+  updateQuery.bindValue(":userandomserver", info.useRandomServer ? 1 : 0);
+  updateQuery.bindValue(":perform", info.perform.join("\n"));
+  updateQuery.bindValue(":useautoidentify", info.useAutoIdentify ? 1 : 0);
+  updateQuery.bindValue(":autoidentifyservice", info.autoIdentifyService);
+  updateQuery.bindValue(":autoidentifypassword", info.autoIdentifyPassword);
+  updateQuery.bindValue(":useautoreconnect", info.useAutoReconnect ? 1 : 0);
+  updateQuery.bindValue(":autoreconnectinterval", info.autoReconnectInterval);
+  updateQuery.bindValue(":autoreconnectretries", info.autoReconnectRetries);
+  updateQuery.bindValue(":unlimitedconnectretries", info.unlimitedReconnectRetries ? 1 : 0);
+  updateQuery.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0);
+  updateQuery.bindValue(":networkid", info.networkId.toInt());
+  safeExec(updateQuery);
+  if(!watchQuery(updateQuery))
+    return false;
+
+  QSqlQuery dropServersQuery(logDb());
+  dropServersQuery.prepare("DELETE FROM ircserver WHERE networkid = :networkid");
+  dropServersQuery.bindValue(":networkid", info.networkId.toInt());
+  safeExec(dropServersQuery);
+  if(!watchQuery(dropServersQuery))
+    return false;
+
+  QSqlQuery insertServersQuery(logDb());
+  insertServersQuery.prepare(queryString("insert_server"));
+  foreach(Network::Server server, info.serverList) {
+    insertServersQuery.bindValue(":userid", user.toInt());
+    insertServersQuery.bindValue(":networkid", info.networkId.toInt());
+    insertServersQuery.bindValue(":hostname", server.host);
+    insertServersQuery.bindValue(":port", server.port);
+    insertServersQuery.bindValue(":password", server.password);
+    insertServersQuery.bindValue(":ssl", server.useSsl ? 1 : 0);
+    insertServersQuery.bindValue(":sslversion", server.sslVersion);
+    insertServersQuery.bindValue(":useproxy", server.useProxy ? 1 : 0);
+    insertServersQuery.bindValue(":proxytype", server.proxyType);
+    insertServersQuery.bindValue(":proxyhost", server.proxyHost);
+    insertServersQuery.bindValue(":proxyport", server.proxyPort);
+    insertServersQuery.bindValue(":proxyuser", server.proxyUser);
+    insertServersQuery.bindValue(":proxypass", server.proxyPass);
+
+    safeExec(insertServersQuery);
+    if(!watchQuery(insertServersQuery))
+      return false;
+  }
+
+  return true;
+}
+
+bool SqliteStorage::removeNetwork(UserId user, const NetworkId &networkId) {
+  if(!isValidNetwork(user, networkId))
+     return false;
+
+  bool withTransaction = logDb().driver()->hasFeature(QSqlDriver::Transactions);
+  if(withTransaction) {
+    sync();
+    if(!logDb().transaction()) {
+      qWarning() << "SqliteStorage::removeNetwork(): cannot start transaction. continuing with out rollback support!";
+      withTransaction = false;
+    }
+  }
+
+  QSqlQuery deleteBacklogQuery(logDb());
+  deleteBacklogQuery.prepare(queryString("delete_backlog_for_network"));
+  deleteBacklogQuery.bindValue(":networkid", networkId.toInt());
+  safeExec(deleteBacklogQuery);
+  if(!watchQuery(deleteBacklogQuery)) {
+    if(withTransaction)
+      logDb().rollback();
+    return false;
+  }
+
+  QSqlQuery deleteBuffersQuery(logDb());
+  deleteBuffersQuery.prepare(queryString("delete_buffers_for_network"));
+  deleteBuffersQuery.bindValue(":networkid", networkId.toInt());
+  safeExec(deleteBuffersQuery);
+  if(!watchQuery(deleteBuffersQuery)) {
+    if(withTransaction)
+      logDb().rollback();
+    return false;
+  }
+
+  QSqlQuery deleteServersQuery(logDb());
+  deleteServersQuery.prepare(queryString("delete_ircservers_for_network"));
+  deleteServersQuery.bindValue(":networkid", networkId.toInt());
+  safeExec(deleteServersQuery);
+  if(!watchQuery(deleteServersQuery)) {
+    if(withTransaction)
+      logDb().rollback();
+    return false;
+  }
+
+  QSqlQuery deleteNetworkQuery(logDb());
+  deleteNetworkQuery.prepare(queryString("delete_network"));
+  deleteNetworkQuery.bindValue(":networkid", networkId.toInt());
+  safeExec(deleteNetworkQuery);
+  if(!watchQuery(deleteNetworkQuery)) {
+    if(withTransaction)
+      logDb().rollback();
+    return false;
+  }
+
+  logDb().commit();
+  return true;
+}
+
+QList<NetworkInfo> SqliteStorage::networks(UserId user) {
+  QList<NetworkInfo> nets;
+
+  QSqlQuery networksQuery(logDb());
+  networksQuery.prepare(queryString("select_networks_for_user"));
+  networksQuery.bindValue(":userid", user.toInt());
+
+  QSqlQuery serversQuery(logDb());
+  serversQuery.prepare(queryString("select_servers_for_network"));
+
+  safeExec(networksQuery);
+  if(!watchQuery(networksQuery))
+    return nets;
+
+  while(networksQuery.next()) {
+    NetworkInfo net;
+    net.networkId = networksQuery.value(0).toInt();
+    net.networkName = networksQuery.value(1).toString();
+    net.identity = networksQuery.value(2).toInt();
+    net.codecForServer = networksQuery.value(3).toString().toAscii();
+    net.codecForEncoding = networksQuery.value(4).toString().toAscii();
+    net.codecForDecoding = networksQuery.value(5).toString().toAscii();
+    net.useRandomServer = networksQuery.value(6).toInt() == 1 ? true : false;
+    net.perform = networksQuery.value(7).toString().split("\n");
+    net.useAutoIdentify = networksQuery.value(8).toInt() == 1 ? true : false;
+    net.autoIdentifyService = networksQuery.value(9).toString();
+    net.autoIdentifyPassword = networksQuery.value(10).toString();
+    net.useAutoReconnect = networksQuery.value(11).toInt() == 1 ? true : false;
+    net.autoReconnectInterval = networksQuery.value(12).toUInt();
+    net.autoReconnectRetries = networksQuery.value(13).toInt();
+    net.unlimitedReconnectRetries = networksQuery.value(14).toInt() == 1 ? true : false;
+    net.rejoinChannels = networksQuery.value(15).toInt() == 1 ? true : false;
+
+    serversQuery.bindValue(":networkid", net.networkId.toInt());
+    safeExec(serversQuery);
+    if(!watchQuery(serversQuery))
+      return nets;
+
+    Network::ServerList servers;
+    while(serversQuery.next()) {
+      Network::Server server;
+      server.host = serversQuery.value(0).toString();
+      server.port = serversQuery.value(1).toUInt();
+      server.password = serversQuery.value(2).toString();
+      server.useSsl = serversQuery.value(3).toInt() == 1 ? true : false;
+      server.sslVersion = serversQuery.value(4).toInt();
+      server.useProxy = serversQuery.value(5).toInt() == 1 ? true : false;
+      server.proxyType = serversQuery.value(6).toInt();
+      server.proxyHost = serversQuery.value(7).toString();
+      server.proxyPort = serversQuery.value(8).toUInt();
+      server.proxyUser = serversQuery.value(9).toString();
+      server.proxyPass = serversQuery.value(10).toString();
+      servers << server;
     }
+    net.serverList = servers;
+    nets << net;
   }
+  return nets;
+}
+
+bool SqliteStorage::isValidNetwork(UserId user, const NetworkId &networkId) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_networkExists"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  safeExec(query);
+
+  watchQuery(query); // there should not occur any errors
+  if(!query.first())
+    return false;
+
+  Q_ASSERT(!query.next());
+  return true;
 }
 
-uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
-  QSqlQuery query(logDb);
+bool SqliteStorage::isValidBuffer(const UserId &user, const BufferId &bufferId) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_bufferExists"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":bufferid", bufferId.toInt());
+  safeExec(query);
+
+  watchQuery(query);
+  if(!query.first())
+    return false;
+
+  Q_ASSERT(!query.next());
+  return true;
+}
+
+NetworkId 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(":userid", user.toInt());
   query.bindValue(":networkname", network);
-  query.exec();
-  
+  safeExec(query);
+
   if(query.first())
-    return query.value(0).toUInt();
+    return query.value(0).toInt();
   else
-    return 0;
+    return NetworkId();
+}
+
+QList<NetworkId> SqliteStorage::connectedNetworks(UserId user) {
+  QList<NetworkId> connectedNets;
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_connected_networks"));
+  query.bindValue(":userid", user.toInt());
+  safeExec(query);
+  watchQuery(query);
+
+  while(query.next()) {
+    connectedNets << query.value(0).toInt();
+  }
+
+  return connectedNets;
+}
+
+void SqliteStorage::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_network_connected"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  query.bindValue(":connected", isConnected ? 1 : 0);
+  safeExec(query);
+  watchQuery(query);
+}
+
+QHash<QString, QString> SqliteStorage::persistentChannels(UserId user, const NetworkId &networkId) {
+  QHash<QString, QString> persistentChans;
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_persistent_channels"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  safeExec(query);
+  watchQuery(query);
+
+  while(query.next()) {
+    persistentChans[query.value(0).toString()] = query.value(1).toString();
+  }
+
+  return persistentChans;
+}
+
+void SqliteStorage::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_buffer_persistent_channel"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkId", networkId.toInt());
+  query.bindValue(":buffercname", channel.toLower());
+  query.bindValue(":joined", isJoined ? 1 : 0);
+  safeExec(query);
+  watchQuery(query);
 }
 
-BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
-  BufferInfo bufferid;
-  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);
-    getBufferInfoQuery->exec();
-    if(getBufferInfoQuery->first()) {
-      bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
-      emit bufferInfoUpdated(bufferid);
+void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_buffer_set_channel_key"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkId", networkId.toInt());
+  query.bindValue(":buffercname", channel.toLower());
+  query.bindValue(":key", key);
+  safeExec(query);
+  watchQuery(query);
+}
+
+QString SqliteStorage::awayMessage(UserId user, NetworkId networkId) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_network_awaymsg"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  safeExec(query);
+  watchQuery(query);
+  QString awayMsg;
+  if(query.first())
+    awayMsg = query.value(0).toString();
+  return awayMsg;
+}
+
+void SqliteStorage::setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_network_set_awaymsg"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  query.bindValue(":awaymsg", awayMsg);
+  safeExec(query);
+  watchQuery(query);
+}
+
+QString SqliteStorage::userModes(UserId user, NetworkId networkId) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_network_usermode"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  safeExec(query);
+  watchQuery(query);
+  QString modes;
+  if(query.first())
+    modes = query.value(0).toString();
+  return modes;
+}
+
+void SqliteStorage::setUserModes(UserId user, NetworkId networkId, const QString &userModes) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_network_set_usermode"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  query.bindValue(":usermode", userModes);
+  safeExec(query);
+  watchQuery(query);
+}
+
+void SqliteStorage::createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("insert_buffer"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":networkid", networkId.toInt());
+  query.bindValue(":buffertype", (int)type);
+  query.bindValue(":buffername", buffer);
+  query.bindValue(":buffercname", buffer.toLower());
+  safeExec(query);
+
+  watchQuery(query);
+}
+
+BufferInfo SqliteStorage::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer, bool create) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_bufferByName"));
+  query.bindValue(":networkid", networkId.toInt());
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":buffercname", buffer.toLower());
+  safeExec(query);
+
+  if(!query.first()) {
+    if(!create)
+      return BufferInfo();
+
+    createBuffer(user, networkId, type, buffer);
+    safeExec(query);
+    if(!query.first()) {
+      watchQuery(query);
+      qWarning() << "unable to create BufferInfo for:" << user << networkId << buffer;
+      return BufferInfo();
     }
-  } else {
-    bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
   }
 
-  Q_ASSERT(!getBufferInfoQuery->next());
+  BufferInfo bufferInfo = BufferInfo(query.value(0).toInt(), networkId, (BufferInfo::Type)query.value(1).toInt(), 0, buffer);
+  if(query.next()) {
+    qCritical() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
+    qCritical() << "         Query:" << query.lastQuery();
+    qCritical() << "  bound Values:";
+    QList<QVariant> list = query.boundValues().values();
+    for (int i = 0; i < list.size(); ++i)
+      qCritical() << i << ":" << list.at(i).toString().toAscii().data();
+    Q_ASSERT(false);
+  }
 
-  return bufferid;
+  return bufferInfo;
 }
 
-QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const BufferId &bufferId) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_buffer_by_id"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":bufferid", bufferId.toInt());
+  safeExec(query);
+  if(!watchQuery(query))
+    return BufferInfo();
+
+  if(!query.first())
+    return BufferInfo();
+
+  BufferInfo bufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), 0, query.value(4).toString());
+  Q_ASSERT(!query.next());
+
+  return bufferInfo;
+}
+
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user) {
   QList<BufferInfo> bufferlist;
-  QSqlQuery query(logDb);
-  query.prepare("SELECT DISTINCT buffer.bufferid, networkname, buffername FROM buffer "
-                "JOIN network ON buffer.networkid = network.networkid "
-                "JOIN backlog ON buffer.bufferid = backlog.bufferid "
-                "WHERE buffer.userid = :userid AND time >= :time");
-  query.bindValue(":userid", user);
-  if (since.isValid()) {
-    query.bindValue(":time", since.toTime_t());
-  } else {
-    query.bindValue(":time", 0);
-  }
-  
-  query.exec();
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_buffers"));
+  query.bindValue(":userid", user.toInt());
 
+  safeExec(query);
+  watchQuery(query);
   while(query.next()) {
-    bufferlist << BufferInfo(query.value(0).toUInt(), getNetworkId(user, query.value(1).toString()), 0, query.value(1).toString(), query.value(2).toString());
+    bufferlist << BufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), query.value(3).toInt(), query.value(4).toString());
   }
   return bufferlist;
 }
 
+QList<BufferId> SqliteStorage::requestBufferIdsForNetwork(UserId user, NetworkId networkId) {
+  QList<BufferId> bufferList;
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_buffers_for_network"));
+  query.bindValue(":networkid", networkId.toInt());
+  query.bindValue(":userid", user.toInt());
+
+  safeExec(query);
+  watchQuery(query);
+  while(query.next()) {
+    bufferList << BufferId(query.value(0).toInt());
+  }
+  return bufferList;
+}
+
+bool SqliteStorage::removeBuffer(const UserId &user, const BufferId &bufferId) {
+  if(!isValidBuffer(user, bufferId))
+    return false;
+
+  QSqlQuery delBacklogQuery(logDb());
+  delBacklogQuery.prepare(queryString("delete_backlog_for_buffer"));
+  delBacklogQuery.bindValue(":bufferid", bufferId.toInt());
+  safeExec(delBacklogQuery);
+  if(!watchQuery(delBacklogQuery))
+    return false;
+
+  QSqlQuery delBufferQuery(logDb());
+  delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+  delBufferQuery.bindValue(":bufferid", bufferId.toInt());
+  safeExec(delBufferQuery);
+  if(!watchQuery(delBufferQuery))
+    return false;
+
+  return true;
+}
+
+bool SqliteStorage::renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) {
+  if(!isValidBuffer(user, bufferId))
+    return false;
+
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_buffer_name"));
+  query.bindValue(":buffername", newName);
+  query.bindValue(":buffercname", newName.toLower());
+  query.bindValue(":bufferid", bufferId.toInt());
+  safeExec(query);
+  if(query.lastError().isValid()) {
+    // unexepcted error occured (19 == constraint violation)
+    if(query.lastError().number() != 19)
+      watchQuery(query);
+    return false;
+  }
+
+  return true;
+}
+
+bool SqliteStorage::mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) {
+  if(!isValidBuffer(user, bufferId1) || !isValidBuffer(user, bufferId2))
+    return false;
+
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_backlog_bufferid"));
+  query.bindValue(":oldbufferid", bufferId2.toInt());
+  query.bindValue(":newbufferid", bufferId1.toInt());
+  safeExec(query);
+  if(!watchQuery(query))
+    return false;
+
+  QSqlQuery delBufferQuery(logDb());
+  delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+  delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
+  safeExec(delBufferQuery);
+  watchQuery(delBufferQuery);
+
+  return true;
+}
+
+void SqliteStorage::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_buffer_lastseen"));
+
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":bufferid", bufferId.toInt());
+  query.bindValue(":lastseenmsgid", msgId.toInt());
+  safeExec(query);
+  watchQuery(query);
+}
+
+QHash<BufferId, MsgId> SqliteStorage::bufferLastSeenMsgIds(UserId user) {
+  QHash<BufferId, MsgId> lastSeenHash;
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_buffer_lastseen_messages"));
+  query.bindValue(":userid", user.toInt());
+  safeExec(query);
+  if(!watchQuery(query))
+    return lastSeenHash;
+
+  while(query.next()) {
+    lastSeenHash[query.value(0).toInt()] = query.value(1).toInt();
+  }
+  return lastSeenHash;
+}
+
 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->exec();
-  
-  if(logMessageQuery->lastError().isValid()) {
+  QSqlQuery logMessageQuery(logDb());
+  logMessageQuery.prepare(queryString("insert_message"));
+
+  logMessageQuery.bindValue(":time", msg.timestamp().toTime_t());
+  logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
+  logMessageQuery.bindValue(":type", msg.type());
+  logMessageQuery.bindValue(":flags", (int)msg.flags());
+  logMessageQuery.bindValue(":sender", msg.sender());
+  logMessageQuery.bindValue(":message", msg.contents());
+  safeExec(logMessageQuery);
+
+  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->exec();
-      watchQuery(addSenderQuery);
-      logMessageQuery->exec();
+    if(logMessageQuery.lastError().number() == 19) {
+      QSqlQuery addSenderQuery(logDb());
+      addSenderQuery.prepare(queryString("insert_sender"));
+      addSenderQuery.bindValue(":sender", msg.sender());
+      safeExec(addSenderQuery);
+      safeExec(logMessageQuery);
       if(!watchQuery(logMessageQuery))
        return 0;
     } else {
@@ -378,145 +960,102 @@ MsgId SqliteStorage::logMessage(Message msg) {
     }
   }
 
-  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();
-    Q_ASSERT(false);
-    return 0;
-  }
+  MsgId msgId = logMessageQuery.lastInsertId().toInt();
+  Q_ASSERT(msgId.isValid());
+  return msgId;
 }
 
-QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
+QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId first, MsgId last, int limit) {
   QList<Message> messagelist;
-  // we have to determine the real offset first
-  requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgsOffsetQuery->bindValue(":messageid", offset);
-  requestMsgsOffsetQuery->exec();
-  requestMsgsOffsetQuery->first();
-  offset = requestMsgsOffsetQuery->value(0).toUInt();
-
-  // now let's select the messages
-  requestMsgsQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgsQuery->bindValue(":bufferid2", buffer.uid());  // Qt can't handle the same placeholder used twice
-  requestMsgsQuery->bindValue(":limit", lastmsgs);
-  requestMsgsQuery->bindValue(":offset", offset);
-  requestMsgsQuery->exec();
-  while(requestMsgsQuery->next()) {
-    Message msg(QDateTime::fromTime_t(requestMsgsQuery->value(1).toInt()),
-                buffer,
-                (Message::Type)requestMsgsQuery->value(2).toUInt(),
-                requestMsgsQuery->value(5).toString(),
-                requestMsgsQuery->value(4).toString(),
-                requestMsgsQuery->value(3).toUInt());
-    msg.setMsgId(requestMsgsQuery->value(0).toUInt());
+
+  BufferInfo bufferInfo = getBufferInfo(user, bufferId);
+  if(!bufferInfo.isValid())
+    return messagelist;
+
+  QSqlQuery query(logDb());
+  
+  if(last == -1 && first == -1) {
+    query.prepare(queryString("select_messagesNewestK"));
+  } else if(last == -1) {
+    query.prepare(queryString("select_messagesNewerThan"));
+    query.bindValue(":firstmsg", first.toInt());
+  } else {
+    query.prepare(queryString("select_messages"));
+    query.bindValue(":lastmsg", last.toInt());
+    query.bindValue(":firstmsg", first.toInt());
+  }
+
+  query.bindValue(":bufferid", bufferId.toInt());
+  query.bindValue(":limit", limit);
+  safeExec(query);
+
+  watchQuery(query);
+
+  while(query.next()) {
+    Message msg(QDateTime::fromTime_t(query.value(1).toInt()),
+                bufferInfo,
+                (Message::Type)query.value(2).toUInt(),
+                query.value(5).toString(),
+                query.value(4).toString(),
+                (Message::Flags)query.value(3).toUInt());
+    msg.setMsgId(query.value(0).toInt());
     messagelist << msg;
   }
   return messagelist;
 }
 
-
-QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
+QList<Message> SqliteStorage::requestAllMsgs(UserId user, MsgId first, MsgId last, int limit) {
   QList<Message> messagelist;
-  // we have to determine the real offset first
-  requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgsSinceOffsetQuery->bindValue(":since", since.toTime_t());
-  requestMsgsSinceOffsetQuery->exec();
-  requestMsgsSinceOffsetQuery->first();
-  offset = requestMsgsSinceOffsetQuery->value(0).toUInt();  
-
-  // now let's select the messages
-  requestMsgsSinceQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgsSinceQuery->bindValue(":bufferid2", buffer.uid());
-  requestMsgsSinceQuery->bindValue(":since", since.toTime_t());
-  requestMsgsSinceQuery->bindValue(":offset", offset);
-  requestMsgsSinceQuery->exec();
-
-  while(requestMsgsSinceQuery->next()) {
-    Message msg(QDateTime::fromTime_t(requestMsgsSinceQuery->value(1).toInt()),
-                buffer,
-                (Message::Type)requestMsgsSinceQuery->value(2).toUInt(),
-                requestMsgsSinceQuery->value(5).toString(),
-                requestMsgsSinceQuery->value(4).toString(),
-                requestMsgsSinceQuery->value(3).toUInt());
-    msg.setMsgId(requestMsgsSinceQuery->value(0).toUInt());
-    messagelist << msg;
+
+  QHash<BufferId, BufferInfo> bufferInfoHash;
+  foreach(BufferInfo bufferInfo, requestBuffers(user)) {
+    bufferInfoHash[bufferInfo.bufferId()] = bufferInfo;
   }
 
-  return messagelist;
-}
+  QSqlQuery query(logDb());
+  if(last == -1) {
+    query.prepare(queryString("select_messagesAllNew"));
+  } else {
+    query.prepare(queryString("select_messagesAll"));
+    query.bindValue(":lastmsg", last.toInt());
+  }
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":firstmsg", first.toInt());
+  query.bindValue(":limit", limit);
+  safeExec(query);
 
+  watchQuery(query);
 
-QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
-  QList<Message> messagelist;
-  requestMsgRangeQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid());
-  requestMsgRangeQuery->bindValue(":firstmsg", first);
-  requestMsgRangeQuery->bindValue(":lastmsg", last);
-
-  while(requestMsgRangeQuery->next()) {
-    Message msg(QDateTime::fromTime_t(requestMsgRangeQuery->value(1).toInt()),
-                buffer,
-                (Message::Type)requestMsgRangeQuery->value(2).toUInt(),
-                requestMsgRangeQuery->value(5).toString(),
-                requestMsgRangeQuery->value(4).toString(),
-                requestMsgRangeQuery->value(3).toUInt());
-    msg.setMsgId(requestMsgRangeQuery->value(0).toUInt());
+  while(query.next()) {
+    Message msg(QDateTime::fromTime_t(query.value(2).toInt()),
+                bufferInfoHash[query.value(1).toInt()],
+                (Message::Type)query.value(3).toUInt(),
+                query.value(6).toString(),
+                query.value(5).toString(),
+                (Message::Flags)query.value(4).toUInt());
+    msg.setMsgId(query.value(0).toInt());
     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();
-  }
-  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);
+QString SqliteStorage::backlogFile() {
+  return Quassel::configDirPath() + "quassel-storage.sqlite";
+}
+
+bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount) {
   query.exec();
-  logDb.commit();
-  qDebug() << "All userdata has been deleted";
-  qDebug() << "importing old backlog files...";
-  initBackLogOld(user);
-  logDb.commit();
-  return;
-}
-
-
-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();
-    
+
+  if(!query.lastError().isValid())
+    return true;
+
+  switch(query.lastError().number()) {
+  case 5: // SQLITE_BUSY         5   /* The database file is locked */
+  case 6: // SQLITE_LOCKED       6   /* A table in the database is locked */
+    if(retryCount < _maxRetryCount)
+      return safeExec(query, retryCount + 1);
+  default:
     return false;
   }
-  return true;
 }