X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=0cde45d10bc6a2820e7a0490b28efd0fb1edef59;hp=86bf9881877f829ac428052c85a0b2c01437d4b1;hb=d28b9ec38b6ea0bc473200fc2f1e65abd1b56bd6;hpb=06a03c2c69ee934aaeec83512bae2fffee83a340

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 86bf9881..0cde45d1 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   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        *
@@ -20,165 +20,16 @@
 
 #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;
-  }
-
-  // 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();
-  }
+#include <QCryptographicHash>
 
-  // 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)");
-
-  getBufferIdQuery = new QSqlQuery(logDb);
-  getBufferIdQuery->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 ");
+#include <QtSql>
 
+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 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() {
@@ -187,16 +38,32 @@ bool SqliteStorage::isAvailable() {
 }
 
 QString SqliteStorage::displayName() {
-  // I think the class name is a good start here
-  return QString("SqliteStorage");
+  return QString("SQLite");
+}
+
+QString SqliteStorage::engineName() {
+  return SqliteStorage::displayName();
 }
 
-UserId SqliteStorage::addUser(QString user, QString password) {
+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();
+}
+
+UserId SqliteStorage::addUser(const QString &user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
-  QSqlQuery query(logDb);
-  query.prepare("INSERT INTO quasseluser (username, password) VALUES (:username, :password)");
+  QSqlQuery query(logDb());
+  query.prepare(queryString("insert_quasseluser"));
   query.bindValue(":username", user);
   query.bindValue(":password", cryptopass);
   query.exec();
@@ -204,7 +71,7 @@ UserId SqliteStorage::addUser(QString user, QString password) {
     return 0;
   }
 
-  query.prepare("SELECT userid FROM quasseluser WHERE username = :username");
+  query.prepare(queryString("select_userid"));
   query.bindValue(":username", user);
   query.exec();
   query.first();
@@ -213,32 +80,32 @@ UserId SqliteStorage::addUser(QString user, QString password) {
   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();
 
-  QSqlQuery query(logDb);
-  query.prepare("UPDATE quasseluser SET password = :password WHERE userid = :userid");
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_userpassword"));
   query.bindValue(":userid", user);
   query.bindValue(":password", cryptopass);
   query.exec();
 }
 
-void SqliteStorage::renameUser(UserId user, QString newName) {
-  QSqlQuery query(logDb);
-  query.prepare("UPDATE quasseluser SET username = :username WHERE userid = :userid");
+void SqliteStorage::renameUser(UserId user, const QString &newName) {
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_username"));
   query.bindValue(":userid", user);
   query.bindValue(":username", newName);
   query.exec();
   emit userRenamed(user, newName);
 }
 
-UserId SqliteStorage::validateUser(QString user, QString password) {
+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();
@@ -246,40 +113,42 @@ UserId SqliteStorage::validateUser(QString user, QString password) {
   if(query.first()) {
     return query.value(0).toUInt();
   } 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");
+  QSqlQuery query(logDb());
+  query.prepare(queryString("delete_backlog_by_uid"));
   query.bindValue(":userid", user);
   query.exec();
-  query.prepare("DELETE FROM buffergroup WHERE userid = :userid");
+  
+  query.prepare(queryString("delete_buffers_by_uid"));
   query.bindValue(":userid", user);
   query.exec();
-  query.prepare("DELETE FROM network WHERE userid = :userid");
+  
+  query.prepare(queryString("delete_networks_by_uid"));
   query.bindValue(":userid", user);
   query.exec();
-  query.prepare("DELETE FROM quasseluser WHERE userid = :userid");
+  
+  query.prepare(queryString("delete_quasseluser"));
   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) {
+  QSqlQuery *createBufferQuery = cachedQuery("insert_buffer");
   createBufferQuery->bindValue(":userid", user);
+  createBufferQuery->bindValue(":userid2", user);  // Qt can't handle same placeholder twice (maybe sqlites fault)
   createBufferQuery->bindValue(":networkname", network);
   createBufferQuery->bindValue(":buffername", buffer);
   createBufferQuery->exec();
 
   if(createBufferQuery->lastError().isValid()) {
-    if(createBufferQuery->lastError().number() == 19) { // Null Constraint violation 
+    if(createBufferQuery->lastError().number() == 19) { // Null Constraint violation
+      QSqlQuery *createNetworkQuery = cachedQuery("insert_network");
       createNetworkQuery->bindValue(":userid", user);
       createNetworkQuery->bindValue(":networkname", network);
       createNetworkQuery->exec();
@@ -294,97 +163,128 @@ 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();
+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(":networkname", network);
+  query.exec();
+  
+  if(query.first())
+    return query.value(0).value<NetworkId>();
+  else {
+    createBuffer(user, network, "");
+    query.exec();
+    if(query.first())
+      return query.value(0).value<NetworkId>();
+    else {
+      qWarning() << "NETWORK NOT FOUND:" << network << "for User:" << user;
+      return 0;
+    }
+  }
+}
+
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
+  BufferInfo bufferid;
+  // TODO: get rid of this hackaround
+  NetworkId networkId = getNetworkId(user, network);
 
-  if(!getBufferIdQuery->first()) {
+  QSqlQuery *getBufferInfoQuery = cachedQuery("select_bufferByName");
+  getBufferInfoQuery->bindValue(":networkname", network);
+  getBufferInfoQuery->bindValue(":userid", user);
+  getBufferInfoQuery->bindValue(":userid2", user); // Qt can't handle same placeholder twice... though I guess it's sqlites fault
+  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).value<BufferId>(), networkId, 0, network, buffer);
+      emit bufferInfoUpdated(user, bufferid);
     }
   } else {
-    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+    bufferid = BufferInfo(getBufferInfoQuery->value(0).value<BufferId>(), 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;
-  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");
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
+  uint time = 0;
+  if(since.isValid())
+    time = since.toTime_t();
+  
+  QList<BufferInfo> bufferlist;
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_buffers"));
   query.bindValue(":userid", user);
-  if (since.isValid()) {
-    query.bindValue(":time", since.toTime_t());
-  } else {
-    query.bindValue(":time", 0);
-  }
+  query.bindValue(":time", time);
   
   query.exec();
-
+  watchQuery(&query);
   while(query.next()) {
-    bufferlist << BufferId(query.value(0).toUInt(), query.value(1).toString(), query.value(2).toString());
+    bufferlist << BufferInfo(query.value(0).value<BufferId>(), query.value(2).value<NetworkId>(), 0, query.value(3).toString(), query.value(1).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);
+  QSqlQuery *logMessageQuery = cachedQuery("insert_message");
+  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);
+    if(logMessageQuery->lastError().number() == 19) {
+      QSqlQuery *addSenderQuery = cachedQuery("insert_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);
+  QSqlQuery *getLastMessageIdQuery = cachedQuery("select_lastMessage");
+  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();
+    return getLastMessageIdQuery->value(0).value<MsgId>();
   } 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
+  QSqlQuery *requestMsgsOffsetQuery = cachedQuery("select_messagesOffset");
   requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid());
   requestMsgsOffsetQuery->bindValue(":messageid", offset);
   requestMsgsOffsetQuery->exec();
   requestMsgsOffsetQuery->first();
-  offset = requestMsgsOffsetQuery->value(0).toUInt();
+  offset = requestMsgsOffsetQuery->value(0).toInt();
 
   // now let's select the messages
+  QSqlQuery *requestMsgsQuery = cachedQuery("select_messages");
   requestMsgsQuery->bindValue(":bufferid", buffer.uid());
   requestMsgsQuery->bindValue(":bufferid2", buffer.uid());  // Qt can't handle the same placeholder used twice
   requestMsgsQuery->bindValue(":limit", lastmsgs);
@@ -397,23 +297,25 @@ 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).value<MsgId>());
     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
+  QSqlQuery *requestMsgsSinceOffsetQuery = cachedQuery("select_messagesSinceOffset");
   requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid());
   requestMsgsSinceOffsetQuery->bindValue(":since", since.toTime_t());
   requestMsgsSinceOffsetQuery->exec();
   requestMsgsSinceOffsetQuery->first();
-  offset = requestMsgsSinceOffsetQuery->value(0).toUInt();  
+  offset = requestMsgsSinceOffsetQuery->value(0).toInt();
 
   // now let's select the messages
+  QSqlQuery *requestMsgsSinceQuery = cachedQuery("select_messagesSince");
   requestMsgsSinceQuery->bindValue(":bufferid", buffer.uid());
   requestMsgsSinceQuery->bindValue(":bufferid2", buffer.uid());
   requestMsgsSinceQuery->bindValue(":since", since.toTime_t());
@@ -427,7 +329,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).value<MsgId>());
     messagelist << msg;
   }
 
@@ -435,8 +337,9 @@ 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;
+  QSqlQuery *requestMsgRangeQuery = cachedQuery("select_messageRange");
   requestMsgRangeQuery->bindValue(":bufferid", buffer.uid());
   requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid());
   requestMsgRangeQuery->bindValue(":firstmsg", first);
@@ -449,42 +352,25 @@ 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).value<MsgId>());
     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);
-  query.exec();
-  logDb.commit();
-  qDebug() << "All userdata has been deleted";
-  qDebug() << "importing old backlog files...";
-  initBackLogOld(user);
-  logDb.commit();
-  return;
+QString SqliteStorage::backlogFile() {
+  // kinda ugly, but I currently see no other way to do that
+#ifdef Q_OS_WIN32
+  QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "\\quassel\\";
+#else
+  QString quasselDir = QDir::homePath() + "/.quassel/";
+#endif
+
+  QDir qDir(quasselDir);
+  if(!qDir.exists(quasselDir))
+    qDir.mkpath(quasselDir);
+  
+  return quasselDir + "quassel-storage.sqlite";  
 }
 
-
-