projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce a flag EventManager::Silent
[quassel.git]
/
src
/
core
/
postgresqlstorage.cpp
diff --git
a/src/core/postgresqlstorage.cpp
b/src/core/postgresqlstorage.cpp
index
0ae2d6d
..
ba998ea
100644
(file)
--- a/
src/core/postgresqlstorage.cpp
+++ b/
src/core/postgresqlstorage.cpp
@@
-338,7
+338,7
@@
IdentityId PostgreSqlStorage::createIdentity(UserId user, CoreIdentity &identity
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::createIdentity(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::createIdentity(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return IdentityId();
}
qWarning() << " -" << qPrintable(db.lastError().text());
return IdentityId();
}
@@
-421,7
+421,7
@@
bool PostgreSqlStorage::updateIdentity(UserId user, const CoreIdentity &identity
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::updateIdentity(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::updateIdentity(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
@@
-550,7
+550,7
@@
NetworkId PostgreSqlStorage::createNetwork(UserId user, const NetworkInfo &info)
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::createNetwork(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::createNetwork(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return NetworkId();
}
qWarning() << " -" << qPrintable(db.lastError().text());
return NetworkId();
}
@@
-640,7
+640,7
@@
bool PostgreSqlStorage::updateNetwork(UserId user, const NetworkInfo &info) {
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::updateNetwork(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::updateNetwork(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
@@
-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)) {