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) "
}
SqliteStorage::~SqliteStorage() {
+ //logDb.close();
delete logMessageQuery;
delete addSenderQuery;
delete getLastMessageIdQuery;
delete requestMsgRangeQuery;
delete createNetworkQuery;
delete createBufferQuery;
- delete getBufferIdQuery;
+ delete getBufferInfoQuery;
logDb.close();
}
"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,"
qWarning(tr("Disabling logging...").toAscii());
Q_ASSERT(false); // quassel does require logging
}
+
+ addUser("Default", "password");
}
bool SqliteStorage::isAvailable() {
}
QString SqliteStorage::displayName() {
- // I think the class name is a good start here
return QString("SqliteStorage");
}
-UserId SqliteStorage::addUser(QString user, QString password) {
+UserId SqliteStorage::addUser(const QString &user, const QString &password) {
QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
cryptopass = cryptopass.toHex();
query.exec();
if(query.lastError().isValid() && query.lastError().number() == 19) { // user already exists - sadly 19 seems to be the general constraint violation error...
return 0;
- }
+ }
query.prepare("SELECT userid FROM quasseluser WHERE username = :username");
query.bindValue(":username", user);
query.exec();
query.first();
- return query.value(0).toUInt();
+ UserId uid = query.value(0).toUInt();
+ emit userAdded(uid, user);
+ return uid;
}
-void SqliteStorage::updateUser(UserId user, QString password) {
+void SqliteStorage::updateUser(UserId user, const QString &password) {
QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
cryptopass = cryptopass.toHex();
query.exec();
}
-UserId SqliteStorage::validateUser(QString user, QString password) {
+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);
+ query.bindValue(":username", newName);
+ query.exec();
+ emit userRenamed(user, newName);
+}
+
+UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
cryptopass = cryptopass.toHex();
query.bindValue(":userid", user);
query.exec();
// I hate the lack of foreign keys and on delete cascade... :(
+ emit userRemoved(user);
}
-void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) {
+void SqliteStorage::createBuffer(UserId user, const QString &network, const QString &buffer) {
createBufferQuery->bindValue(":userid", user);
createBufferQuery->bindValue(":networkname", network);
createBufferQuery->bindValue(":buffername", buffer);
}
}
-BufferId SqliteStorage::getBufferId(UserId user, QString network, QString buffer) {
- BufferId bufferid;
- getBufferIdQuery->bindValue(":networkname", network);
- getBufferIdQuery->bindValue(":userid", user);
- getBufferIdQuery->bindValue(":buffername", buffer);
- getBufferIdQuery->exec();
+uint 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(":networkname", network);
+ query.exec();
+
+ if(query.first())
+ return query.value(0).toUInt();
+ 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);
+ 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<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 "
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(":bufferid", msg.buffer.uid());
- logMessageQuery->bindValue(":type", msg.type);
- logMessageQuery->bindValue(":flags", msg.flags);
- logMessageQuery->bindValue(":sender", msg.sender);
- logMessageQuery->bindValue(":message", msg.text);
+ logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
+ logMessageQuery->bindValue(":bufferid", msg.buffer().uid());
+ logMessageQuery->bindValue(":type", msg.type());
+ logMessageQuery->bindValue(":flags", msg.flags());
+ logMessageQuery->bindValue(":sender", msg.sender());
+ logMessageQuery->bindValue(":message", msg.text());
logMessageQuery->exec();
if(logMessageQuery->lastError().isValid()) {
// constraint violation - must be NOT NULL constraint - probably the sender is missing...
if(logMessageQuery->lastError().number() == 19) {
- addSenderQuery->bindValue(":sender", msg.sender);
+ 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(":bufferid", msg.buffer.uid());
- getLastMessageIdQuery->bindValue(":type", msg.type);
- getLastMessageIdQuery->bindValue(":sender", msg.sender);
+ getLastMessageIdQuery->bindValue(":time", msg.timestamp().toTime_t());
+ getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid());
+ getLastMessageIdQuery->bindValue(":type", msg.type());
+ getLastMessageIdQuery->bindValue(":sender", msg.sender());
getLastMessageIdQuery->exec();
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());
requestMsgsQuery->value(5).toString(),
requestMsgsQuery->value(4).toString(),
requestMsgsQuery->value(3).toUInt());
- msg.msgId = requestMsgsQuery->value(0).toUInt();
+ msg.setMsgId(requestMsgsQuery->value(0).toUInt());
messagelist << msg;
}
return messagelist;
}
-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());
requestMsgsSinceQuery->value(5).toString(),
requestMsgsSinceQuery->value(4).toString(),
requestMsgsSinceQuery->value(3).toUInt());
- msg.msgId = requestMsgsSinceQuery->value(0).toUInt();
+ msg.setMsgId(requestMsgsSinceQuery->value(0).toUInt());
messagelist << msg;
}
}
-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());
requestMsgRangeQuery->value(5).toString(),
requestMsgRangeQuery->value(4).toString(),
requestMsgRangeQuery->value(3).toUInt());
- msg.msgId = requestMsgRangeQuery->value(0).toUInt();
+ msg.setMsgId(requestMsgRangeQuery->value(0).toUInt());
messagelist << msg;
}
}
-
+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;
+}
projects / quassel.git / blobdiff