X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=21d67cd1a40f7a8119f2e849ac81facf74ba1631;hb=b30780406eabbcfdc313721e961ef063ab06c8d4;hp=3d26a9b4e26e9cf7f979f8f2428e4e06a1ede150;hpb=d064f62ec2f316f17c3aac3c31184376380ef098;p=quassel.git

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 3d26a9b4..21d67cd1 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -53,8 +53,8 @@ SqliteStorage::SqliteStorage() {
   createNetworkQuery = new QSqlQuery(logDb);
   createNetworkQuery->prepare("INSERT INTO network (userid, networkname) VALUES (:userid, :networkname)");
 
-  getBufferIdQuery = new QSqlQuery(logDb);
-  getBufferIdQuery->prepare("SELECT bufferid FROM buffer "
+  getBufferInfoQuery = new QSqlQuery(logDb);
+  getBufferInfoQuery->prepare("SELECT bufferid FROM buffer "
                             "JOIN network ON buffer.networkid = network.networkid "
                             "WHERE network.networkname = :networkname AND buffer.userid = :userid AND buffer.buffername = :buffername ");
 
@@ -120,7 +120,7 @@ SqliteStorage::~SqliteStorage() {
   delete requestMsgRangeQuery;
   delete createNetworkQuery;
   delete createBufferQuery;
-  delete getBufferIdQuery;
+  delete getBufferInfoQuery;
   logDb.close();
 }
 
@@ -179,6 +179,8 @@ void SqliteStorage::initDb() {
     qWarning(tr("Disabling logging...").toAscii());
     Q_ASSERT(false); // quassel does require logging
   }
+
+  addUser("Default", "password");
 }
 
 bool SqliteStorage::isAvailable() {
@@ -307,32 +309,32 @@ uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
     return 0;
 }
 
-BufferId SqliteStorage::getBufferId(UserId user, const QString &network, const QString &buffer) {
-  BufferId bufferid;
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
+  BufferInfo bufferid;
   uint networkId = getNetworkId(user, network);
-  getBufferIdQuery->bindValue(":networkname", network);
-  getBufferIdQuery->bindValue(":userid", user);
-  getBufferIdQuery->bindValue(":buffername", buffer);
-  getBufferIdQuery->exec();
+  getBufferInfoQuery->bindValue(":networkname", network);
+  getBufferInfoQuery->bindValue(":userid", user);
+  getBufferInfoQuery->bindValue(":buffername", buffer);
+  getBufferInfoQuery->exec();
 
-  if(!getBufferIdQuery->first()) {
+  if(!getBufferInfoQuery->first()) {
     createBuffer(user, network, buffer);
-    getBufferIdQuery->exec();
-    if(getBufferIdQuery->first()) {
-      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), networkId, 0, network, buffer);
-      emit bufferIdUpdated(bufferid);
+    getBufferInfoQuery->exec();
+    if(getBufferInfoQuery->first()) {
+      bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
+      emit bufferInfoUpdated(bufferid);
     }
   } else {
-    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), networkId, 0, network, buffer);
+    bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
   }
 
-  Q_ASSERT(!getBufferIdQuery->next());
+  Q_ASSERT(!getBufferInfoQuery->next());
 
   return bufferid;
 }
 
-QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
-  QList<BufferId> bufferlist;
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
+  QList<BufferInfo> bufferlist;
   QSqlQuery query(logDb);
   query.prepare("SELECT DISTINCT buffer.bufferid, networkname, buffername FROM buffer "
                 "JOIN network ON buffer.networkid = network.networkid "
@@ -348,13 +350,13 @@ QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
   query.exec();
 
   while(query.next()) {
-    bufferlist << BufferId(query.value(0).toUInt(), getNetworkId(user, query.value(1).toString()), 0, query.value(1).toString(), query.value(2).toString());
+    bufferlist << BufferInfo(query.value(0).toUInt(), getNetworkId(user, query.value(1).toString()), 0, query.value(1).toString(), query.value(2).toString());
   }
   return bufferlist;
 }
 
 MsgId SqliteStorage::logMessage(Message msg) {
-  logMessageQuery->bindValue(":time", msg.timeStamp().toTime_t());
+  logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
   logMessageQuery->bindValue(":bufferid", msg.buffer().uid());
   logMessageQuery->bindValue(":type", msg.type());
   logMessageQuery->bindValue(":flags", msg.flags());
@@ -367,14 +369,16 @@ MsgId SqliteStorage::logMessage(Message msg) {
     if(logMessageQuery->lastError().number() == 19) { 
       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(":time", msg.timestamp().toTime_t());
   getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid());
   getLastMessageIdQuery->bindValue(":type", msg.type());
   getLastMessageIdQuery->bindValue(":sender", msg.sender());
@@ -383,13 +387,13 @@ MsgId SqliteStorage::logMessage(Message msg) {
   if(getLastMessageIdQuery->first()) {
     return getLastMessageIdQuery->value(0).toUInt();
   } else { // somethin went wrong... :(
-    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timeStamp().toTime_t() << msg.buffer().uid() << msg.type() << msg.sender();
+    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timestamp().toTime_t() << msg.buffer().uid() << msg.type() << msg.sender();
     Q_ASSERT(false);
     return 0;
   }
 }
 
-QList<Message> SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int offset) {
+QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
   QList<Message> messagelist;
   // we have to determine the real offset first
   requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid());
@@ -418,7 +422,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int off
 }
 
 
-QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int offset) {
+QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
   QList<Message> messagelist;
   // we have to determine the real offset first
   requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid());
@@ -449,7 +453,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int
 }
 
 
-QList<Message> SqliteStorage::requestMsgRange(BufferId buffer, int first, int last) {
+QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
   QList<Message> messagelist;
   requestMsgRangeQuery->bindValue(":bufferid", buffer.uid());
   requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid());
@@ -501,4 +505,18 @@ void SqliteStorage::importOldBacklog() {
 }
 
 
-
+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;
+}