networkId = getNetworkId(user, info.networkName);
if(!networkId.isValid()) {
- watchQuery(&query);
+ watchQuery(query);
} else {
NetworkInfo newNetworkInfo = info;
newNetworkInfo.networkId = networkId;
updateQuery.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0);
updateQuery.bindValue(":networkid", info.networkId.toInt());
updateQuery.exec();
- if(!watchQuery(&updateQuery))
+ if(!watchQuery(updateQuery))
return false;
QSqlQuery dropServersQuery(logDb());
dropServersQuery.prepare("DELETE FROM ircserver WHERE networkid = :networkid");
dropServersQuery.bindValue(":networkid", info.networkId.toInt());
dropServersQuery.exec();
- if(!watchQuery(&dropServersQuery))
+ if(!watchQuery(dropServersQuery))
return false;
QSqlQuery insertServersQuery(logDb());
insertServersQuery.bindValue(":networkid", info.networkId.toInt());
insertServersQuery.exec();
- if(!watchQuery(&insertServersQuery))
+ if(!watchQuery(insertServersQuery))
return false;
}
if(withTransaction) {
sync();
if(!logDb().transaction()) {
- quWarning() << "SqliteStorage::removeNetwork(): cannot start transaction. continuing with out rollback support!";
+ qWarning() << "SqliteStorage::removeNetwork(): cannot start transaction. continuing with out rollback support!";
withTransaction = false;
}
}
deleteBacklogQuery.prepare(queryString("delete_backlog_for_network"));
deleteBacklogQuery.bindValue(":networkid", networkId.toInt());
deleteBacklogQuery.exec();
- if(!watchQuery(&deleteBacklogQuery)) {
+ if(!watchQuery(deleteBacklogQuery)) {
if(withTransaction)
logDb().rollback();
return false;
deleteBuffersQuery.prepare(queryString("delete_buffers_for_network"));
deleteBuffersQuery.bindValue(":networkid", networkId.toInt());
deleteBuffersQuery.exec();
- if(!watchQuery(&deleteBuffersQuery)) {
+ if(!watchQuery(deleteBuffersQuery)) {
if(withTransaction)
logDb().rollback();
return false;
deleteServersQuery.prepare(queryString("delete_ircservers_for_network"));
deleteServersQuery.bindValue(":networkid", networkId.toInt());
deleteServersQuery.exec();
- if(!watchQuery(&deleteServersQuery)) {
+ if(!watchQuery(deleteServersQuery)) {
if(withTransaction)
logDb().rollback();
return false;
deleteNetworkQuery.prepare(queryString("delete_network"));
deleteNetworkQuery.bindValue(":networkid", networkId.toInt());
deleteNetworkQuery.exec();
- if(!watchQuery(&deleteNetworkQuery)) {
+ if(!watchQuery(deleteNetworkQuery)) {
if(withTransaction)
logDb().rollback();
return false;
serversQuery.prepare(queryString("select_servers_for_network"));
networksQuery.exec();
- if(!watchQuery(&networksQuery))
+ if(!watchQuery(networksQuery))
return nets;
while(networksQuery.next()) {
serversQuery.bindValue(":networkid", net.networkId.toInt());
serversQuery.exec();
- if(!watchQuery(&serversQuery))
+ if(!watchQuery(serversQuery))
return nets;
QVariantList servers;
query.bindValue(":networkid", networkId.toInt());
query.exec();
- watchQuery(&query); // there should not occur any errors
+ watchQuery(query); // there should not occur any errors
if(!query.first())
return false;
query.bindValue(":bufferid", bufferId.toInt());
query.exec();
- watchQuery(&query);
+ watchQuery(query);
if(!query.first())
return false;
query.prepare(queryString("select_connected_networks"));
query.bindValue(":userid", user.toInt());
query.exec();
- watchQuery(&query);
+ watchQuery(query);
while(query.next()) {
connectedNets << query.value(0).toInt();
query.bindValue(":networkid", networkId.toInt());
query.bindValue(":connected", isConnected ? 1 : 0);
query.exec();
- watchQuery(&query);
+ watchQuery(query);
}
QHash<QString, QString> SqliteStorage::persistentChannels(UserId user, const NetworkId &networkId) {
query.bindValue(":userid", user.toInt());
query.bindValue(":networkid", networkId.toInt());
query.exec();
- watchQuery(&query);
+ watchQuery(query);
while(query.next()) {
persistentChans[query.value(0).toString()] = query.value(1).toString();
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":joined", isJoined ? 1 : 0);
query.exec();
- watchQuery(&query);
+ watchQuery(query);
}
void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) {
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":key", key);
query.exec();
- watchQuery(&query);
+ watchQuery(query);
}
void SqliteStorage::createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
- QSqlQuery *query = cachedQuery("insert_buffer");
- query->bindValue(":userid", user.toInt());
- query->bindValue(":networkid", networkId.toInt());
- query->bindValue(":buffertype", (int)type);
- query->bindValue(":buffername", buffer);
- query->bindValue(":buffercname", buffer.toLower());
- query->exec();
+ QSqlQuery query(logDb());
+ query.prepare(queryString("insert_buffer"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":networkid", networkId.toInt());
+ query.bindValue(":buffertype", (int)type);
+ query.bindValue(":buffername", buffer);
+ query.bindValue(":buffercname", buffer.toLower());
+ query.exec();
watchQuery(query);
}
BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
- QSqlQuery *query = cachedQuery("select_bufferByName");
- query->bindValue(":networkid", networkId.toInt());
- query->bindValue(":userid", user.toInt());
- query->bindValue(":buffercname", buffer.toLower());
- query->exec();
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_bufferByName"));
+ query.bindValue(":networkid", networkId.toInt());
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":buffercname", buffer.toLower());
+ query.exec();
- if(!query->first()) {
+ if(!query.first()) {
createBuffer(user, networkId, type, buffer);
- query->exec();
- if(!query->first()) {
+ query.exec();
+ if(!query.first()) {
watchQuery(query);
- quWarning() << "unable to create BufferInfo for:" << user << networkId << buffer;
+ qWarning() << "unable to create BufferInfo for:" << user << networkId << buffer;
return BufferInfo();
}
}
- BufferInfo bufferInfo = BufferInfo(query->value(0).toInt(), networkId, (BufferInfo::Type)query->value(1).toInt(), 0, buffer);
- if(query->next()) {
- quError() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
- quError() << " Query:" << query->lastQuery();
- quError() << " bound Values:";
- QList<QVariant> list = query->boundValues().values();
+ BufferInfo bufferInfo = BufferInfo(query.value(0).toInt(), networkId, (BufferInfo::Type)query.value(1).toInt(), 0, buffer);
+ if(query.next()) {
+ qCritical() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
+ qCritical() << " Query:" << query.lastQuery();
+ qCritical() << " bound Values:";
+ QList<QVariant> list = query.boundValues().values();
for (int i = 0; i < list.size(); ++i)
- quError() << i << ":" << list.at(i).toString().toAscii().data();
+ qCritical() << i << ":" << list.at(i).toString().toAscii().data();
Q_ASSERT(false);
}
query.bindValue(":userid", user.toInt());
query.bindValue(":bufferid", bufferId.toInt());
query.exec();
- if(!watchQuery(&query))
+ if(!watchQuery(query))
return BufferInfo();
if(!query.first())
query.bindValue(":userid", user.toInt());
query.exec();
- watchQuery(&query);
+ watchQuery(query);
while(query.next()) {
bufferlist << BufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), query.value(3).toInt(), query.value(4).toString());
}
query.bindValue(":userid", user.toInt());
query.exec();
- watchQuery(&query);
+ watchQuery(query);
while(query.next()) {
bufferList << BufferId(query.value(0).toInt());
}
delBacklogQuery.prepare(queryString("delete_backlog_for_buffer"));
delBacklogQuery.bindValue(":bufferid", bufferId.toInt());
delBacklogQuery.exec();
- if(!watchQuery(&delBacklogQuery))
+ if(!watchQuery(delBacklogQuery))
return false;
QSqlQuery delBufferQuery(logDb());
delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
delBufferQuery.bindValue(":bufferid", bufferId.toInt());
delBufferQuery.exec();
- if(!watchQuery(&delBufferQuery))
+ if(!watchQuery(delBufferQuery))
return false;
return true;
existsQuery.bindValue(":userid", user.toInt());
existsQuery.bindValue(":buffercname", oldName.toLower());
existsQuery.exec();
- if(!watchQuery(&existsQuery))
+ if(!watchQuery(existsQuery))
return false;
if(!existsQuery.first())
existsQuery.bindValue(":userid", user.toInt());
existsQuery.bindValue(":buffercname", newName.toLower());
existsQuery.exec();
- if(!watchQuery(&existsQuery))
+ if(!watchQuery(existsQuery))
return false;
if(existsQuery.first())
renameBufferQuery.bindValue(":buffercname", newName.toLower());
renameBufferQuery.bindValue(":bufferid", bufferid);
renameBufferQuery.exec();
- if(watchQuery(&existsQuery))
+ if(watchQuery(existsQuery))
return BufferId(bufferid);
else
return BufferId();
}
void SqliteStorage::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
- QSqlQuery *query = cachedQuery("update_buffer_lastseen");
- query->bindValue(":userid", user.toInt());
- query->bindValue(":bufferid", bufferId.toInt());
- query->bindValue(":lastseenmsgid", msgId.toInt());
- query->exec();
+ QSqlQuery query(logDb());
+ query.prepare(queryString("update_buffer_lastseen"));
+
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":bufferid", bufferId.toInt());
+ query.bindValue(":lastseenmsgid", msgId.toInt());
+ query.exec();
watchQuery(query);
}
query.prepare(queryString("select_buffer_lastseen_messages"));
query.bindValue(":userid", user.toInt());
query.exec();
- if(!watchQuery(&query))
+ if(!watchQuery(query))
return lastSeenHash;
while(query.next()) {
}
MsgId SqliteStorage::logMessage(Message msg) {
- QSqlQuery *logMessageQuery = cachedQuery("insert_message");
- logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
- logMessageQuery->bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
- logMessageQuery->bindValue(":type", msg.type());
- logMessageQuery->bindValue(":flags", (int)msg.flags());
- logMessageQuery->bindValue(":sender", msg.sender());
- logMessageQuery->bindValue(":message", msg.contents());
- logMessageQuery->exec();
+ QSqlQuery logMessageQuery(logDb());
+ logMessageQuery.prepare(queryString("insert_message"));
+
+ logMessageQuery.bindValue(":time", msg.timestamp().toTime_t());
+ logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
+ logMessageQuery.bindValue(":type", msg.type());
+ logMessageQuery.bindValue(":flags", (int)msg.flags());
+ logMessageQuery.bindValue(":sender", msg.sender());
+ logMessageQuery.bindValue(":message", msg.contents());
+ logMessageQuery.exec();
- if(logMessageQuery->lastError().isValid()) {
+ if(logMessageQuery.lastError().isValid()) {
// constraint violation - must be NOT NULL constraint - probably the sender is missing...
- if(logMessageQuery->lastError().number() == 19) {
- QSqlQuery *addSenderQuery = cachedQuery("insert_sender");
- addSenderQuery->bindValue(":sender", msg.sender());
- addSenderQuery->exec();
- watchQuery(addSenderQuery);
- logMessageQuery->exec();
+ if(logMessageQuery.lastError().number() == 19) {
+ QSqlQuery addSenderQuery(logDb());
+ addSenderQuery.prepare(queryString("insert_sender"));
+ addSenderQuery.bindValue(":sender", msg.sender());
+ addSenderQuery.exec();
+ logMessageQuery.exec();
if(!watchQuery(logMessageQuery))
return 0;
} else {
}
}
- MsgId msgId = logMessageQuery->lastInsertId().toInt();
+ MsgId msgId = logMessageQuery.lastInsertId().toInt();
Q_ASSERT(msgId.isValid());
return msgId;
}
offset = 0;
} else {
// we have to determine the real offset first
- QSqlQuery *offsetQuery = cachedQuery("select_messagesOffset");
- offsetQuery->bindValue(":bufferid", bufferId.toInt());
- offsetQuery->bindValue(":messageid", offset);
- offsetQuery->exec();
- offsetQuery->first();
- offset = offsetQuery->value(0).toInt();
+ QSqlQuery offsetQuery(logDb());
+ offsetQuery.prepare(queryString("select_messagesOffset"));
+
+ offsetQuery.bindValue(":bufferid", bufferId.toInt());
+ offsetQuery.bindValue(":messageid", offset);
+ offsetQuery.exec();
+ offsetQuery.first();
+ offset = offsetQuery.value(0).toInt();
}
// now let's select the messages
- QSqlQuery *msgQuery = cachedQuery("select_messages");
- msgQuery->bindValue(":bufferid", bufferId.toInt());
- msgQuery->bindValue(":limit", lastmsgs);
- msgQuery->bindValue(":offset", offset);
- msgQuery->exec();
+ QSqlQuery msgQuery(logDb());
+ msgQuery.prepare(queryString("select_messages"));
+
+ msgQuery.bindValue(":bufferid", bufferId.toInt());
+ msgQuery.bindValue(":limit", lastmsgs);
+ msgQuery.bindValue(":offset", offset);
+ msgQuery.exec();
watchQuery(msgQuery);
- while(msgQuery->next()) {
- Message msg(QDateTime::fromTime_t(msgQuery->value(1).toInt()),
+ while(msgQuery.next()) {
+ Message msg(QDateTime::fromTime_t(msgQuery.value(1).toInt()),
bufferInfo,
- (Message::Type)msgQuery->value(2).toUInt(),
- msgQuery->value(5).toString(),
- msgQuery->value(4).toString(),
- (Message::Flags)msgQuery->value(3).toUInt());
- msg.setMsgId(msgQuery->value(0).toInt());
+ (Message::Type)msgQuery.value(2).toUInt(),
+ msgQuery.value(5).toString(),
+ msgQuery.value(4).toString(),
+ (Message::Flags)msgQuery.value(3).toUInt());
+ msg.setMsgId(msgQuery.value(0).toInt());
messagelist << msg;
}
return messagelist;
return messagelist;
// we have to determine the real offset first
- QSqlQuery *offsetQuery = cachedQuery("select_messagesSinceOffset");
- offsetQuery->bindValue(":bufferid", bufferId.toInt());
- offsetQuery->bindValue(":since", since.toTime_t());
- offsetQuery->exec();
- offsetQuery->first();
- offset = offsetQuery->value(0).toInt();
+ QSqlQuery offsetQuery(logDb());
+ offsetQuery.prepare(queryString("select_messagesSinceOffset"));
+
+ offsetQuery.bindValue(":bufferid", bufferId.toInt());
+ offsetQuery.bindValue(":since", since.toTime_t());
+ offsetQuery.exec();
+ offsetQuery.first();
+ offset = offsetQuery.value(0).toInt();
// now let's select the messages
- QSqlQuery *msgQuery = cachedQuery("select_messagesSince");
- msgQuery->bindValue(":bufferid", bufferId.toInt());
- msgQuery->bindValue(":since", since.toTime_t());
- msgQuery->bindValue(":offset", offset);
- msgQuery->exec();
+ QSqlQuery msgQuery(logDb());
+ msgQuery.prepare(queryString("select_messagesSince"));
+ msgQuery.bindValue(":bufferid", bufferId.toInt());
+ msgQuery.bindValue(":since", since.toTime_t());
+ msgQuery.bindValue(":offset", offset);
+ msgQuery.exec();
watchQuery(msgQuery);
- while(msgQuery->next()) {
- Message msg(QDateTime::fromTime_t(msgQuery->value(1).toInt()),
+ while(msgQuery.next()) {
+ Message msg(QDateTime::fromTime_t(msgQuery.value(1).toInt()),
bufferInfo,
- (Message::Type)msgQuery->value(2).toUInt(),
- msgQuery->value(5).toString(),
- msgQuery->value(4).toString(),
- (Message::Flags)msgQuery->value(3).toUInt());
- msg.setMsgId(msgQuery->value(0).toInt());
+ (Message::Type)msgQuery.value(2).toUInt(),
+ msgQuery.value(5).toString(),
+ msgQuery.value(4).toString(),
+ (Message::Flags)msgQuery.value(3).toUInt());
+ msg.setMsgId(msgQuery.value(0).toInt());
messagelist << msg;
}
if(!bufferInfo.isValid())
return messagelist;
- QSqlQuery *rangeQuery = cachedQuery("select_messageRange");
- rangeQuery->bindValue(":bufferid", bufferId.toInt());
- rangeQuery->bindValue(":firstmsg", first);
- rangeQuery->bindValue(":lastmsg", last);
- rangeQuery->exec();
+ QSqlQuery rangeQuery(logDb());
+ rangeQuery.prepare(queryString("select_messageRange"));
+ rangeQuery.bindValue(":bufferid", bufferId.toInt());
+ rangeQuery.bindValue(":firstmsg", first);
+ rangeQuery.bindValue(":lastmsg", last);
+ rangeQuery.exec();
watchQuery(rangeQuery);
- while(rangeQuery->next()) {
- Message msg(QDateTime::fromTime_t(rangeQuery->value(1).toInt()),
+ while(rangeQuery.next()) {
+ Message msg(QDateTime::fromTime_t(rangeQuery.value(1).toInt()),
bufferInfo,
- (Message::Type)rangeQuery->value(2).toUInt(),
- rangeQuery->value(5).toString(),
- rangeQuery->value(4).toString(),
- (Message::Flags)rangeQuery->value(3).toUInt());
- msg.setMsgId(rangeQuery->value(0).toInt());
+ (Message::Type)rangeQuery.value(2).toUInt(),
+ rangeQuery.value(5).toString(),
+ rangeQuery.value(4).toString(),
+ (Message::Flags)rangeQuery.value(3).toUInt());
+ msg.setMsgId(rangeQuery.value(0).toInt());
messagelist << msg;
}
QString SqliteStorage::backlogFile() {
return quasselDir().absolutePath() + "/quassel-storage.sqlite";
}
-
-
-// ONLY NEEDED FOR MIGRATION
-bool SqliteStorage::init(const QVariantMap &settings) {
- if(!AbstractSqlStorage::init(settings))
- return false;
-
- QSqlQuery checkMigratedQuery(logDb());
- checkMigratedQuery.prepare("SELECT DISTINCT typeOf(password) FROM quasseluser");
- checkMigratedQuery.exec();
- if(!watchQuery(&checkMigratedQuery))
- return false;
-
- if(!checkMigratedQuery.first())
- return true; // table is empty -> no work to be done
-
- QString passType = checkMigratedQuery.value(0).toString().toLower();
- if(passType == "text")
- return true; // allready migrated
-
- Q_ASSERT(passType == "blob");
-
- QSqlQuery getPasswordsQuery(logDb());
- getPasswordsQuery.prepare("SELECT userid, password FROM quasseluser");
- getPasswordsQuery.exec();
-
- if(!watchQuery(&getPasswordsQuery)) {
- quError() << "unable to migrate to new password format!";
- return false;
- }
-
- QHash<int, QByteArray> passHash;
- while(getPasswordsQuery.next()) {
- passHash[getPasswordsQuery.value(0).toInt()] = getPasswordsQuery.value(1).toByteArray();
- }
-
- QSqlQuery setPasswordsQuery(logDb());
- setPasswordsQuery.prepare("UPDATE quasseluser SET password = :password WHERE userid = :userid");
- foreach(int userId, passHash.keys()) {
- setPasswordsQuery.bindValue(":password", QString(passHash[userId]));
- setPasswordsQuery.bindValue(":userid", userId);
- setPasswordsQuery.exec();
- watchQuery(&setPasswordsQuery);
- }
-
- quDebug() << "successfully migrated passwords!";
- return true;
-}