projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this should fix buffer merging with Postgres backend
[quassel.git]
/
src
/
core
/
postgresqlstorage.cpp
diff --git
a/src/core/postgresqlstorage.cpp
b/src/core/postgresqlstorage.cpp
index
27c2866
..
ba998ea
100644
(file)
--- a/
src/core/postgresqlstorage.cpp
+++ b/
src/core/postgresqlstorage.cpp
@@
-1102,6
+1102,7
@@
bool PostgreSqlStorage::mergeBuffersPermanently(const UserId &user, const Buffer
QSqlQuery delBufferQuery(logDb());
delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
QSqlQuery delBufferQuery(logDb());
delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+ delBufferQuery.bindValue(":userid", user.toInt());
delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
safeExec(delBufferQuery);
if(!watchQuery(delBufferQuery)) {
delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
safeExec(delBufferQuery);
if(!watchQuery(delBufferQuery)) {