X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.cpp;h=825dda8d67f8b9d423b83fe02a17488d765c7c36;hp=47442705a00a1c90801c66c41820aa7ef842ce9d;hb=59579d82e3a16a815a197a4300c8ef279275ccfc;hpb=2f05c5d7e94d5e96d2b4bae59140fd3b60a7a62f diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp index 47442705..825dda8d 100644 --- a/src/core/abstractsqlstorage.cpp +++ b/src/core/abstractsqlstorage.cpp @@ -102,6 +102,16 @@ bool AbstractSqlStorage::init(const QVariantMap &settings) { return true; } +void AbstractSqlStorage::sync() { + QHash, QSqlQuery *>::iterator iter = _queryCache.begin(); + while(iter != _queryCache.end()) { + delete *iter; + iter = _queryCache.erase(iter); + } + + logDb().commit(); +} + QString AbstractSqlStorage::queryString(const QString &queryName, int version) { if(version == 0) version = schemaVersion(); @@ -170,7 +180,6 @@ QStringList AbstractSqlStorage::upgradeQueries(int version) { QStringList queries; QDir dir = QDir(QString(":/SQL/%1/%2/").arg(engineName()).arg(version)); foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "upgrade*", QDir::NoFilter, QDir::Name)) { - qDebug() << queryString(fileInfo.baseName()); queries << queryString(fileInfo.baseName()); } return queries; @@ -221,13 +230,13 @@ int AbstractSqlStorage::schemaVersion() { bool AbstractSqlStorage::watchQuery(QSqlQuery *query) { if(query->lastError().isValid()) { qWarning() << "unhandled Error in QSqlQuery!"; - qWarning() << " last Query:" << query->lastQuery(); - qWarning() << " executed Query:" << query->executedQuery(); - qWarning() << " bound Values:" << query->boundValues(); - qWarning() << " Error Number:" << query->lastError().number(); - qWarning() << " Error Message:" << query->lastError().text(); - qWarning() << " Driver Message:" << query->lastError().driverText(); - qWarning() << " DB Message:" << query->lastError().databaseText(); + qWarning() << " last Query:\n" << query->lastQuery(); + qWarning() << " executed Query:\n" << query->executedQuery(); + qWarning() << " bound Values:" << query->boundValues(); + qWarning() << " Error Number:" << query->lastError().number(); + qWarning() << " Error Message:" << query->lastError().text(); + qWarning() << " Driver Message:" << query->lastError().driverText(); + qWarning() << " DB Message:" << query->lastError().databaseText(); return false; }