X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=ffd2872847bf46805d9e3f937af902aa2a73466c;hp=3b7480fc8d8e24ee89571de4e5ac3a11de02078d;hb=849a08cae7c2e3c40c7da34c7cee1e10057f551e;hpb=2ee32e7f7707349d12c98181bbe6842f6d19f60e diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 3b7480fc..ffd28728 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -53,10 +53,10 @@ 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 "); + "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) " @@ -120,7 +120,7 @@ SqliteStorage::~SqliteStorage() { delete requestMsgRangeQuery; delete createNetworkQuery; delete createBufferQuery; - delete getBufferIdQuery; + delete getBufferInfoQuery; logDb.close(); } @@ -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,35 +305,45 @@ 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; + } + } } -BufferId SqliteStorage::getBufferId(UserId user, const QString &network, const QString &buffer) { - BufferId bufferid; - getBufferIdQuery->bindValue(":networkname", network); - getBufferIdQuery->bindValue(":userid", user); - getBufferIdQuery->bindValue(":buffername", buffer); - getBufferIdQuery->exec(); +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(":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(), 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(), network, buffer); + bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer); } - Q_ASSERT(!getBufferIdQuery->next()); + Q_ASSERT(!getBufferInfoQuery->next()); return bufferid; } -QList SqliteStorage::requestBuffers(UserId user, QDateTime since) { - QList bufferlist; +QList SqliteStorage::requestBuffers(UserId user, QDateTime since) { + QList bufferlist; QSqlQuery query(logDb); query.prepare("SELECT DISTINCT buffer.bufferid, networkname, buffername FROM buffer " "JOIN network ON buffer.networkid = network.networkid " @@ -347,13 +359,13 @@ QList SqliteStorage::requestBuffers(UserId user, QDateTime since) { query.exec(); while(query.next()) { - bufferlist << BufferId(query.value(0).toUInt(), 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()); @@ -366,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()); @@ -382,13 +396,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 SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int offset) { +QList SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) { QList messagelist; // we have to determine the real offset first requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid()); @@ -417,7 +431,7 @@ QList SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int off } -QList SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int offset) { +QList SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, int offset) { QList messagelist; // we have to determine the real offset first requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid()); @@ -448,7 +462,7 @@ QList SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int } -QList SqliteStorage::requestMsgRange(BufferId buffer, int first, int last) { +QList SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) { QList messagelist; requestMsgRangeQuery->bindValue(":bufferid", buffer.uid()); requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid()); @@ -500,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; +}