projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Semi-yearly copyright bump
[quassel.git]
/
src
/
core
/
postgresqlstorage.cpp
diff --git
a/src/core/postgresqlstorage.cpp
b/src/core/postgresqlstorage.cpp
index
b16f4b0
..
63cb1d0
100644
(file)
--- a/
src/core/postgresqlstorage.cpp
+++ b/
src/core/postgresqlstorage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-944,7
+944,7
@@
void PostgreSqlStorage::setChannelPersistent(UserId user, const NetworkId &netwo
QSqlQuery query(logDb());
query.prepare(queryString("update_buffer_persistent_channel"));
query.bindValue(":userid", user.toInt());
QSqlQuery query(logDb());
query.prepare(queryString("update_buffer_persistent_channel"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":network
I
d", networkId.toInt());
+ query.bindValue(":network
i
d", networkId.toInt());
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":joined", isJoined);
safeExec(query);
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":joined", isJoined);
safeExec(query);
@@
-957,7
+957,7
@@
void PostgreSqlStorage::setPersistentChannelKey(UserId user, const NetworkId &ne
QSqlQuery query(logDb());
query.prepare(queryString("update_buffer_set_channel_key"));
query.bindValue(":userid", user.toInt());
QSqlQuery query(logDb());
query.prepare(queryString("update_buffer_set_channel_key"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":network
I
d", networkId.toInt());
+ query.bindValue(":network
i
d", networkId.toInt());
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":key", key);
safeExec(query);
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":key", key);
safeExec(query);
@@
-1601,7
+1601,7
@@
QList<Message> PostgreSqlStorage::requestAllMsgs(UserId user, MsgId first, MsgId
QDateTime timestamp;
for (int i = 0; i < limit && query.next(); i++) {
QDateTime timestamp;
for (int i = 0; i < limit && query.next(); i++) {
- timestamp = query.value(
1
).toDateTime();
+ timestamp = query.value(
2
).toDateTime();
timestamp.setTimeSpec(Qt::UTC);
Message msg(timestamp,
bufferInfoHash[query.value(1).toInt()],
timestamp.setTimeSpec(Qt::UTC);
Message msg(timestamp,
bufferInfoHash[query.value(1).toInt()],
@@
-1841,6
+1841,7
@@
bool PostgreSqlMigrationWriter::writeMo(const QuasselUserMO &user)
bindValue(0, user.id.toInt());
bindValue(1, user.username);
bindValue(2, user.password);
bindValue(0, user.id.toInt());
bindValue(1, user.username);
bindValue(2, user.password);
+ bindValue(3, user.hashversion);
return exec();
}
return exec();
}