projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renaming _all_ instances of _networkToolBar to _mainToolBar
[quassel.git]
/
src
/
core
/
sqlitestorage.cpp
diff --git
a/src/core/sqlitestorage.cpp
b/src/core/sqlitestorage.cpp
index
718dc59
..
e199409
100644
(file)
--- a/
src/core/sqlitestorage.cpp
+++ b/
src/core/sqlitestorage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel
IRC Team
*
+ * Copyright (C) 2005-07 by the Quassel
Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-22,10
+22,9
@@
#include <QtSql>
#include <QtSql>
-#include "network.h"
-
-#include "util.h"
#include "logger.h"
#include "logger.h"
+#include "network.h"
+#include "quassel.h"
int SqliteStorage::_maxRetryCount = 150; // yes this is a large number... only other way to "handle" this is bailing out...
int SqliteStorage::_maxRetryCount = 150; // yes this is a large number... only other way to "handle" this is bailing out...
@@
-283,11
+282,13
@@
bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity &identity) {
#endif
query.bindValue(":identityid", identity.id().toInt());
safeExec(query);
#endif
query.bindValue(":identityid", identity.id().toInt());
safeExec(query);
+ watchQuery(query);
QSqlQuery deleteNickQuery(logDb());
deleteNickQuery.prepare(queryString("delete_nicks"));
deleteNickQuery.bindValue(":identityid", identity.id().toInt());
safeExec(deleteNickQuery);
QSqlQuery deleteNickQuery(logDb());
deleteNickQuery.prepare(queryString("delete_nicks"));
deleteNickQuery.bindValue(":identityid", identity.id().toInt());
safeExec(deleteNickQuery);
+ watchQuery(deleteNickQuery);
QSqlQuery insertNickQuery(logDb());
insertNickQuery.prepare(queryString("insert_nick"));
QSqlQuery insertNickQuery(logDb());
insertNickQuery.prepare(queryString("insert_nick"));
@@
-295,6
+296,7
@@
bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity &identity) {
insertNickQuery.bindValue(":identityid", identity.id().toInt());
insertNickQuery.bindValue(":nick", nick);
safeExec(insertNickQuery);
insertNickQuery.bindValue(":identityid", identity.id().toInt());
insertNickQuery.bindValue(":nick", nick);
safeExec(insertNickQuery);
+ watchQuery(insertNickQuery);
}
return true;
}
return true;
@@
-688,7
+690,7
@@
void SqliteStorage::createBuffer(UserId user, const NetworkId &networkId, Buffer
watchQuery(query);
}
watchQuery(query);
}
-BufferInfo SqliteStorage::
getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer
) {
+BufferInfo SqliteStorage::
bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer, bool create
) {
QSqlQuery query(logDb());
query.prepare(queryString("select_bufferByName"));
query.bindValue(":networkid", networkId.toInt());
QSqlQuery query(logDb());
query.prepare(queryString("select_bufferByName"));
query.bindValue(":networkid", networkId.toInt());
@@
-697,6
+699,9
@@
BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId,
safeExec(query);
if(!query.first()) {
safeExec(query);
if(!query.first()) {
+ if(!create)
+ return BufferInfo();
+
createBuffer(user, networkId, type, buffer);
safeExec(query);
if(!query.first()) {
createBuffer(user, networkId, type, buffer);
safeExec(query);
if(!query.first()) {
@@
-895,15
+900,19
@@
QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId
return messagelist;
QSqlQuery query(logDb());
return messagelist;
QSqlQuery query(logDb());
- if(last == -1) {
- query.prepare(queryString("select_messagesNew"));
+
+ if(last == -1 && first == -1) {
+ query.prepare(queryString("select_messagesNewestK"));
+ } else if(last == -1) {
+ query.prepare(queryString("select_messagesNewerThan"));
+ query.bindValue(":firstmsg", first.toInt());
} else {
query.prepare(queryString("select_messages"));
query.bindValue(":lastmsg", last.toInt());
} else {
query.prepare(queryString("select_messages"));
query.bindValue(":lastmsg", last.toInt());
+ query.bindValue(":firstmsg", first.toInt());
}
query.bindValue(":bufferid", bufferId.toInt());
}
query.bindValue(":bufferid", bufferId.toInt());
- query.bindValue(":firstmsg", first.toInt());
query.bindValue(":limit", limit);
safeExec(query);
query.bindValue(":limit", limit);
safeExec(query);
@@
-959,7
+968,7
@@
QList<Message> SqliteStorage::requestAllMsgs(UserId user, MsgId first, MsgId las
}
QString SqliteStorage::backlogFile() {
}
QString SqliteStorage::backlogFile() {
- return
quasselDir().absolutePath() + "/
quassel-storage.sqlite";
+ return
Quassel::configDirPath() + "
quassel-storage.sqlite";
}
bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount) {
}
bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount) {