/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-07 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
if(!_connectionPool.contains(QThread::currentThread()))
addConnectionToPool();
- qDebug() << "using logDb" << _connectionPool[QThread::currentThread()]->name() << QThread::currentThread();
return QSqlDatabase::database(_connectionPool[QThread::currentThread()]->name());
}
int connectionId = _nextConnectionId++;
- Connection *connection = new Connection(QLatin1String(QString("quassel_connection_%1").arg(connectionId).toLatin1()), this);
- qDebug() << "new connection" << connection->name() << currentThread << QLatin1String(QString("quassel_connection_%1").arg(connectionId).toLatin1());
+ Connection *connection = new Connection(QLatin1String(QString("quassel_connection_%1").arg(connectionId).toLatin1()));
connection->moveToThread(currentThread);
- connect(this, SIGNAL(syncCachedQueries()), connection, SLOT(syncCachedQueries()));
connect(this, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
connect(currentThread, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
connect(connection, SIGNAL(destroyed()), this, SLOT(connectionDestroyed()));
}
}
-bool AbstractSqlStorage::init(const QVariantMap &settings) {
+Storage::State AbstractSqlStorage::init(const QVariantMap &settings) {
Q_UNUSED(settings)
+
QSqlDatabase db = logDb();
if(!db.isValid() || !db.isOpen())
- return false;
+ return NotAvailable;
if(installedSchemaVersion() == -1) {
qCritical() << "Storage Schema is missing!";
- return false;
+ return NeedsSetup;
}
if(installedSchemaVersion() > schemaVersion()) {
qCritical() << "Installed Schema is newer then any known Version.";
- return false;
+ return NotAvailable;
}
-
+
if(installedSchemaVersion() < schemaVersion()) {
- qWarning() << "Installed Schema is not up to date. Upgrading...";
- if(!upgradeDb())
- return false;
+ qWarning() << qPrintable(tr("Installed Schema (version %1) is not up to date. Upgrading to version %2...").arg(installedSchemaVersion()).arg(schemaVersion()));
+ if(!upgradeDb()) {
+ qWarning() << qPrintable(tr("Upgrade failed..."));
+ return NotAvailable;
+ }
}
-
- quInfo() << "Storage Backend is ready. Quassel Schema Version:" << installedSchemaVersion();
- return true;
-}
-void AbstractSqlStorage::sync() {
- emit syncCachedQueries();
+ quInfo() << "Storage Backend is ready. Quassel Schema Version:" << installedSchemaVersion();
+ return IsReady;
}
QString AbstractSqlStorage::queryString(const QString &queryName, int version) {
if(version == 0)
version = schemaVersion();
-
+
QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(displayName()).arg(version).arg(queryName));
if(!queryInfo.exists() || !queryInfo.isFile() || !queryInfo.isReadable()) {
qCritical() << "Unable to read SQL-Query" << queryName << "for engine" << displayName();
return QString();
QString query = QTextStream(&queryFile).readAll();
queryFile.close();
-
- return query.trimmed();
-}
-QSqlQuery &AbstractSqlStorage::cachedQuery(const QString &queryName, int version) {
- Q_ASSERT(_connectionPool.contains(QThread::currentThread()));
- qDebug() << "cached query" << queryName << "using" << _connectionPool[QThread::currentThread()]->name() << QThread::currentThread();
- return _connectionPool[QThread::currentThread()]->cachedQuery(queryName, version);
+ return query.trimmed();
}
QStringList AbstractSqlStorage::setupQueries() {
return false;
}
}
- return true;
+ return setupSchemaVersion(schemaVersion());
}
QStringList AbstractSqlStorage::upgradeQueries(int version) {
}
}
}
- return true;
+ return updateSchemaVersion(schemaVersion());
}
qCritical() << " Error Message:" << query.lastError().text();
qCritical() << " Driver Message:" << query.lastError().driverText();
qCritical() << " DB Message:" << query.lastError().databaseText();
-
+
return false;
}
return true;
// ========================================
// AbstractSqlStorage::Connection
// ========================================
-AbstractSqlStorage::Connection::Connection(const QString &name, AbstractSqlStorage *storage, QObject *parent)
+AbstractSqlStorage::Connection::Connection(const QString &name, QObject *parent)
: QObject(parent),
- _name(name.toLatin1()),
- _storageEngine(storage)
+ _name(name.toLatin1())
{
}
AbstractSqlStorage::Connection::~Connection() {
- QHash<QPair<QString, int>, QSqlQuery *>::iterator iter = _queryCache.begin();
- while(iter != _queryCache.end()) {
- delete *iter;
- iter = _queryCache.erase(iter);
- }
{
QSqlDatabase db = QSqlDatabase::database(name(), false);
if(db.isOpen()) {
}
QSqlDatabase::removeDatabase(name());
}
-
-QSqlQuery &AbstractSqlStorage::Connection::cachedQuery(const QString &queryName, int version) {
- QPair<QString, int> queryId = qMakePair(queryName, version);
- if(_queryCache.contains(queryId)) {
- return *(_queryCache[queryId]);
- }
-
- QSqlQuery *query = new QSqlQuery(QSqlDatabase::database(name()));
- query->prepare(_storageEngine->queryString(queryName, version));
- _queryCache[queryId] = query;
- return *query;
-}
-
-void AbstractSqlStorage::Connection::syncCachedQueries() {
- QHash<QPair<QString, int>, QSqlQuery *>::iterator iter = _queryCache.begin();
- while(iter != _queryCache.end()) {
- delete *iter;
- iter = _queryCache.erase(iter);
- }
- QSqlDatabase db = QSqlDatabase::database(name(), false);
- if(db.isOpen())
- db.commit();
-}