projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement IRCv3.2 capability negotiation
[quassel.git]
/
src
/
core
/
postgresqlstorage.cpp
diff --git
a/src/core/postgresqlstorage.cpp
b/src/core/postgresqlstorage.cpp
index
e7a71e7
..
acb7f37
100644
(file)
--- a/
src/core/postgresqlstorage.cpp
+++ b/
src/core/postgresqlstorage.cpp
@@
-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);
@@
-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();
}
@@
-2004,7
+2005,7
@@
bool PostgreSqlMigrationWriter::postProcess()
<< Sequence("quasseluser", "userid")
<< Sequence("sender", "senderid");
QList<Sequence>::const_iterator iter;
<< Sequence("quasseluser", "userid")
<< Sequence("sender", "senderid");
QList<Sequence>::const_iterator iter;
- for (iter = sequences.constBegin(); iter != sequences.constEnd();
iter++
) {
+ for (iter = sequences.constBegin(); iter != sequences.constEnd();
++iter
) {
resetQuery();
newQuery(QString("SELECT setval('%1_%2_seq', max(%2)) FROM %1").arg(iter->table, iter->field), db);
if (!exec())
resetQuery();
newQuery(QString("SELECT setval('%1_%2_seq', max(%2)) FROM %1").arg(iter->table, iter->field), db);
if (!exec())