X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=48f2df8b243b45616e478d40a84735c504e4ff26;hp=52846cdac6b4b761539875d234f072c2be06dc53;hb=4c9bac32c316fca8007e02190c709b212f73a93e;hpb=d367ab103f7c201efc9f82e9e32da43ab71da2ac

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 52846cda..48f2df8b 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -20,36 +20,16 @@
 
 #include "sqlitestorage.h"
 
+#include <QCryptographicHash>
+
 #include <QtSql>
 
-SqliteStorage::SqliteStorage() {
-  logMessageQuery = NULL;
-  addSenderQuery = NULL;
-  getLastMessageIdQuery = NULL;
-  requestMsgsQuery = NULL;
-  requestMsgsOffsetQuery = NULL;
-  requestMsgsSinceQuery = NULL;
-  requestMsgsSinceOffsetQuery = NULL;
-  requestMsgRangeQuery = NULL;
-  createNetworkQuery = NULL;
-  createBufferQuery = NULL;
-  getBufferInfoQuery = NULL;
+SqliteStorage::SqliteStorage(QObject *parent)
+  : AbstractSqlStorage(parent)
+{
 }
 
 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() {
@@ -58,182 +38,32 @@ bool SqliteStorage::isAvailable() {
 }
 
 QString SqliteStorage::displayName() {
-  return QString("SQlite");
+  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;
+QString SqliteStorage::engineName() {
+  return SqliteStorage::displayName();
 }
 
-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;
-  }
+int SqliteStorage::installedSchemaVersion() {
+  QSqlQuery query = logDb().exec("SELECT value FROM coreinfo WHERE key = 'schemaversion'");
+  if(query.first())
+    return query.value(0).toInt();
 
-  // 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 {
-    qWarning("Sqlite is not ready!");
-    return false;
-  }
+  // maybe it's really old... (schema version 0)
+  query = logDb().exec("SELECT MAX(version) FROM coreinfo");
+  if(query.first())
+    return query.value(0).toInt();
 
-  // 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 AND userid = :userid2), :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 network.userid = :userid AND buffer.userid = :userid2 AND lower(buffer.buffername) = lower(: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 ");
-  
-  return true;
+  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();
@@ -241,11 +71,11 @@ UserId SqliteStorage::addUser(const QString &user, const 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();
-  UserId uid = query.value(0).toUInt();
+  UserId uid = query.value(0).toInt();
   emit userAdded(uid, user);
   return uid;
 }
@@ -254,17 +84,17 @@ 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);
+  QSqlQuery query(logDb());
+  query.prepare(queryString("update_userpassword"));
+  query.bindValue(":userid", user.toInt());
   query.bindValue(":password", cryptopass);
   query.exec();
 }
 
 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();
   emit userRenamed(user, newName);
@@ -274,56 +104,57 @@ 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();
 
   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);
+  QSqlQuery query(logDb());
+  query.prepare(queryString("delete_backlog_by_uid"));
+  query.bindValue(":userid", user.toInt());
   query.exec();
-  query.prepare("DELETE FROM buffergroup WHERE userid = :userid");
-  query.bindValue(":userid", user);
+  
+  query.prepare(queryString("delete_buffers_by_uid"));
+  query.bindValue(":userid", user.toInt());
   query.exec();
-  query.prepare("DELETE FROM network WHERE userid = :userid");
-  query.bindValue(":userid", user);
+  
+  query.prepare(queryString("delete_networks_by_uid"));
+  query.bindValue(":userid", user.toInt());
   query.exec();
-  query.prepare("DELETE FROM quasseluser WHERE userid = :userid");
-  query.bindValue(":userid", user);
+  
+  query.prepare(queryString("delete_quasseluser"));
+  query.bindValue(":userid", user.toInt());
   query.exec();
   // 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(":userid2", user);  // Qt can't handle same placeholder twice (maybe sqlites fault)
+  QSqlQuery *createBufferQuery = cachedQuery("insert_buffer");
+  createBufferQuery->bindValue(":userid", user.toInt());
+  createBufferQuery->bindValue(":userid2", user.toInt());  // 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 
-      createNetworkQuery->bindValue(":userid", user);
+    if(createBufferQuery->lastError().number() == 19) { // Null Constraint violation
+      QSqlQuery *createNetworkQuery = cachedQuery("insert_network");
+      createNetworkQuery->bindValue(":userid", user.toInt());
       createNetworkQuery->bindValue(":networkname", network);
       createNetworkQuery->exec();
+      Q_ASSERT(watchQuery(createNetworkQuery));
       createBufferQuery->exec();
-      Q_ASSERT(!createNetworkQuery->lastError().isValid());
-      Q_ASSERT(!createBufferQuery->lastError().isValid());
+      Q_ASSERT(watchQuery(createBufferQuery));
     } else {
       // do panic!
       qDebug() << "failed to create Buffer: ErrNo:" << createBufferQuery->lastError().number() << "ErrMsg:" << createBufferQuery->lastError().text();
@@ -332,21 +163,21 @@ void SqliteStorage::createBuffer(UserId user, const QString &network, const QStr
   }
 }
 
-uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
-  QSqlQuery query(logDb);
+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();
   
   if(query.first())
-    return query.value(0).toUInt();
+    return query.value(0).toInt();
   else {
     createBuffer(user, network, "");
     query.exec();
     if(query.first())
-      return query.value(0).toUInt();
+      return query.value(0).toInt();
     else {
       qWarning() << "NETWORK NOT FOUND:" << network << "for User:" << user;
       return 0;
@@ -357,10 +188,11 @@ uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
 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(":userid2", user); // Qt can't handle same placeholder twice... though I guess it's sqlites fault
+  NetworkId networkId = getNetworkId(user, network);
+
+  QSqlQuery *getBufferInfoQuery = cachedQuery("select_bufferByName");
+  getBufferInfoQuery->bindValue(":networkid", networkId.toInt());
+  getBufferInfoQuery->bindValue(":userid", user.toInt());
   getBufferInfoQuery->bindValue(":buffername", buffer);
   getBufferInfoQuery->exec();
 
@@ -368,11 +200,11 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, con
     createBuffer(user, network, buffer);
     getBufferInfoQuery->exec();
     if(getBufferInfoQuery->first()) {
-      bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
-      emit bufferInfoUpdated(bufferid);
+      bufferid = BufferInfo(getBufferInfoQuery->value(0).toInt(), networkId, 0, network, buffer);
+      emit bufferInfoUpdated(user, bufferid);
     }
   } else {
-    bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
+    bufferid = BufferInfo(getBufferInfoQuery->value(0).toInt(), networkId, 0, network, buffer);
   }
 
   Q_ASSERT(!getBufferInfoQuery->next());
@@ -381,30 +213,28 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, con
 }
 
 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("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);
-  }
+  QSqlQuery query(logDb());
+  query.prepare(queryString("select_buffers"));
+  query.bindValue(":userid", user.toInt());
+  query.bindValue(":time", time);
   
   query.exec();
-
+  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(2).toInt(), 0, query.value(3).toString(), query.value(1).toString());
   }
   return bufferlist;
 }
 
 MsgId SqliteStorage::logMessage(Message msg) {
+  QSqlQuery *logMessageQuery = cachedQuery("insert_message");
   logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
-  logMessageQuery->bindValue(":bufferid", msg.buffer().uid());
+  logMessageQuery->bindValue(":bufferid", msg.buffer().uid().toInt());
   logMessageQuery->bindValue(":type", msg.type());
   logMessageQuery->bindValue(":flags", msg.flags());
   logMessageQuery->bindValue(":sender", msg.sender());
@@ -413,7 +243,8 @@ MsgId SqliteStorage::logMessage(Message msg) {
   
   if(logMessageQuery->lastError().isValid()) {
     // constraint violation - must be NOT NULL constraint - probably the sender is missing...
-    if(logMessageQuery->lastError().number() == 19) { 
+    if(logMessageQuery->lastError().number() == 19) {
+      QSqlQuery *addSenderQuery = cachedQuery("insert_sender");
       addSenderQuery->bindValue(":sender", msg.sender());
       addSenderQuery->exec();
       watchQuery(addSenderQuery);
@@ -425,14 +256,15 @@ MsgId SqliteStorage::logMessage(Message msg) {
     }
   }
 
+  QSqlQuery *getLastMessageIdQuery = cachedQuery("select_lastMessage");
   getLastMessageIdQuery->bindValue(":time", msg.timestamp().toTime_t());
-  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid());
+  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid().toInt());
   getLastMessageIdQuery->bindValue(":type", msg.type());
   getLastMessageIdQuery->bindValue(":sender", msg.sender());
   getLastMessageIdQuery->exec();
 
   if(getLastMessageIdQuery->first()) {
-    return getLastMessageIdQuery->value(0).toUInt();
+    return getLastMessageIdQuery->value(0).toInt();
   } 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);
@@ -443,15 +275,17 @@ MsgId SqliteStorage::logMessage(Message msg) {
 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());
+  QSqlQuery *requestMsgsOffsetQuery = cachedQuery("select_messagesOffset");
+  requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid().toInt());
   requestMsgsOffsetQuery->bindValue(":messageid", offset);
   requestMsgsOffsetQuery->exec();
   requestMsgsOffsetQuery->first();
-  offset = requestMsgsOffsetQuery->value(0).toUInt();
+  offset = requestMsgsOffsetQuery->value(0).toInt();
 
   // 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
+  QSqlQuery *requestMsgsQuery = cachedQuery("select_messages");
+  requestMsgsQuery->bindValue(":bufferid", buffer.uid().toInt());
+  requestMsgsQuery->bindValue(":bufferid2", buffer.uid().toInt());  // Qt can't handle the same placeholder used twice
   requestMsgsQuery->bindValue(":limit", lastmsgs);
   requestMsgsQuery->bindValue(":offset", offset);
   requestMsgsQuery->exec();
@@ -462,7 +296,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int o
                 requestMsgsQuery->value(5).toString(),
                 requestMsgsQuery->value(4).toString(),
                 requestMsgsQuery->value(3).toUInt());
-    msg.setMsgId(requestMsgsQuery->value(0).toUInt());
+    msg.setMsgId(requestMsgsQuery->value(0).toInt());
     messagelist << msg;
   }
   return messagelist;
@@ -472,15 +306,17 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int o
 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());
+  QSqlQuery *requestMsgsSinceOffsetQuery = cachedQuery("select_messagesSinceOffset");
+  requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid().toInt());
   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
-  requestMsgsSinceQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgsSinceQuery->bindValue(":bufferid2", buffer.uid());
+  QSqlQuery *requestMsgsSinceQuery = cachedQuery("select_messagesSince");
+  requestMsgsSinceQuery->bindValue(":bufferid", buffer.uid().toInt());
+  requestMsgsSinceQuery->bindValue(":bufferid2", buffer.uid().toInt());
   requestMsgsSinceQuery->bindValue(":since", since.toTime_t());
   requestMsgsSinceQuery->bindValue(":offset", offset);
   requestMsgsSinceQuery->exec();
@@ -492,7 +328,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, in
                 requestMsgsSinceQuery->value(5).toString(),
                 requestMsgsSinceQuery->value(4).toString(),
                 requestMsgsSinceQuery->value(3).toUInt());
-    msg.setMsgId(requestMsgsSinceQuery->value(0).toUInt());
+    msg.setMsgId(requestMsgsSinceQuery->value(0).toInt());
     messagelist << msg;
   }
 
@@ -502,8 +338,9 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, in
 
 QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
   QList<Message> messagelist;
-  requestMsgRangeQuery->bindValue(":bufferid", buffer.uid());
-  requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid());
+  QSqlQuery *requestMsgRangeQuery = cachedQuery("select_messageRange");
+  requestMsgRangeQuery->bindValue(":bufferid", buffer.uid().toInt());
+  requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid().toInt());
   requestMsgRangeQuery->bindValue(":firstmsg", first);
   requestMsgRangeQuery->bindValue(":lastmsg", last);
 
@@ -514,44 +351,25 @@ QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int
                 requestMsgRangeQuery->value(5).toString(),
                 requestMsgRangeQuery->value(4).toString(),
                 requestMsgRangeQuery->value(3).toUInt());
-    msg.setMsgId(requestMsgRangeQuery->value(0).toUInt());
+    msg.setMsgId(requestMsgRangeQuery->value(0).toInt());
     messagelist << msg;
   }
 
   return messagelist;
 }
 
-QString SqliteStorage::backlogFile(bool createPath) {
+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
-  
-  if (createPath) {
-    QDir *qDir = new QDir(quasselDir);
-    if (!qDir->exists(quasselDir)) {
-      qDir->mkpath(quasselDir);
-    }
-    delete qDir;
-  }
 
-  return quasselDir + "quassel-storage.sqlite";
+  QDir qDir(quasselDir);
+  if(!qDir.exists(quasselDir))
+    qDir.mkpath(quasselDir);
+  
+  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;
-}