X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=ffd2872847bf46805d9e3f937af902aa2a73466c;hp=7ba61fcdbf76e7340866c0af75fed0a68b60f685;hb=849a08cae7c2e3c40c7da34c7cee1e10057f551e;hpb=902c95728306e5ba115de84800fc8d5d239c9d62

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 7ba61fcd..ffd28728 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -56,7 +56,7 @@ SqliteStorage::SqliteStorage() {
   getBufferInfoQuery = new QSqlQuery(logDb);
   getBufferInfoQuery->prepare("SELECT bufferid FROM buffer "
                             "JOIN network ON buffer.networkid = network.networkid "
-                            "WHERE network.networkname = :networkname AND buffer.userid = :userid AND buffer.buffername = :buffername ");
+                            "WHERE network.networkname = :networkname AND buffer.userid = :userid AND lower(buffer.buffername) = lower(:buffername)");
 
   logMessageQuery = new QSqlQuery(logDb);
   logMessageQuery->prepare("INSERT INTO backlog (time, bufferid, type, flags, senderid, message) "
@@ -163,7 +163,7 @@ void SqliteStorage::initDb() {
              "type INTEGER NOT NULL,"
              "flags INTEGER NOT NULL,"
              "senderid INTEGER NOT NULL,"
-             "message TEXT NOT NULL)");
+             "message TEXT)");
   
   logDb.exec("CREATE TABLE coreinfo ("
              "updateid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
@@ -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() {
@@ -303,12 +305,21 @@ uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
   
   if(query.first())
     return query.value(0).toUInt();
-  else
-    return 0;
+  else {
+    createBuffer(user, network, "");
+    query.exec();
+    if(query.first())
+      return query.value(0).toUInt();
+    else {
+      qWarning() << "NETWORK NOT FOUND:" << network << "for User:" << user;
+      return 0;
+    }
+  }
 }
 
 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);
@@ -354,7 +365,7 @@ QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
 }
 
 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 +378,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,7 +396,7 @@ 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;
   }
@@ -501,4 +514,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;
+}