projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3cd8d90
)
fixing buffer merging with postgres backend
author
Marcus Eggenberger
<egs@quassel-irc.org>
Tue, 17 Mar 2009 15:40:54 +0000
(16:40 +0100)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Tue, 17 Mar 2009 15:41:06 +0000
(16:41 +0100)
src/core/postgresqlstorage.cpp
patch
|
blob
|
history
diff --git
a/src/core/postgresqlstorage.cpp
b/src/core/postgresqlstorage.cpp
index
bd1e089
..
13aa8c9
100644
(file)
--- a/
src/core/postgresqlstorage.cpp
+++ b/
src/core/postgresqlstorage.cpp
@@
-1067,7
+1067,7
@@
bool PostgreSqlStorage::mergeBuffersPermanently(const UserId &user, const Buffer
}
QSqlQuery checkQuery(db);
- checkQuery.prepare("SELECT count(*) FROM buffer"
+ checkQuery.prepare("SELECT count(*) FROM buffer
"
"WHERE userid = :userid AND bufferid IN (:buffer1, :buffer2)");
checkQuery.bindValue(":userid", user.toInt());
checkQuery.bindValue(":buffer1", bufferId1.toInt());