X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.cpp;h=fa230f3112594724dee7209f40ceaf33f557fd9e;hb=029c6d402af7b00b320dd5ce48f230783a88957a;hp=467b2260aed3521607d8e556d82b63a3fd4417cb;hpb=b2f681c796855ba0f863eb14b062c5d1a2825df1;p=quassel.git

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index 467b2260..fa230f31 100644
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   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  *
@@ -45,7 +45,6 @@ QSqlDatabase AbstractSqlStorage::logDb() {
   if(!_connectionPool.contains(QThread::currentThread()))
     addConnectionToPool();
 
-  qDebug() << "using logDb" << _connectionPool[QThread::currentThread()]->name() << QThread::currentThread();
   return QSqlDatabase::database(_connectionPool[QThread::currentThread()]->name());
 }
 
@@ -60,10 +59,8 @@ void AbstractSqlStorage::addConnectionToPool() {
 
   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()));
@@ -75,6 +72,9 @@ void AbstractSqlStorage::addConnectionToPool() {
   if(!hostName().isEmpty())
     db.setHostName(hostName());
 
+  if(port() != -1)
+    db.setPort(port());
+
   if(!userName().isEmpty()) {
     db.setUserName(userName());
     db.setPassword(password());
@@ -86,40 +86,39 @@ void AbstractSqlStorage::addConnectionToPool() {
   }
 }
 
-bool AbstractSqlStorage::init(const QVariantMap &settings) {
-  Q_UNUSED(settings)
+Storage::State AbstractSqlStorage::init(const QVariantMap &settings) {
+  setConnectionProperties(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() << qPrintable(displayName()) << "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();
@@ -131,14 +130,8 @@ QString AbstractSqlStorage::queryString(const QString &queryName, int version) {
     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() {
@@ -151,21 +144,28 @@ QStringList AbstractSqlStorage::setupQueries() {
 }
 
 bool AbstractSqlStorage::setup(const QVariantMap &settings) {
-  Q_UNUSED(settings)
+  setConnectionProperties(settings);
   QSqlDatabase db = logDb();
   if(!db.isOpen()) {
     qCritical() << "Unable to setup Logging Backend!";
     return false;
   }
 
+  db.transaction();
   foreach(QString queryString, setupQueries()) {
     QSqlQuery query = db.exec(queryString);
     if(!watchQuery(query)) {
       qCritical() << "Unable to setup Logging Backend!";
+      db.rollback();
       return false;
     }
   }
-  return true;
+  bool success = setupSchemaVersion(schemaVersion());
+  if(success)
+    db.commit();
+  else
+    db.rollback();
+  return success;
 }
 
 QStringList AbstractSqlStorage::upgradeQueries(int version) {
@@ -192,7 +192,7 @@ bool AbstractSqlStorage::upgradeDb() {
       }
     }
   }
-  return true;
+  return updateSchemaVersion(schemaVersion());
 }
 
 
@@ -232,7 +232,7 @@ bool AbstractSqlStorage::watchQuery(QSqlQuery &query) {
     qCritical() << "               Error Message:"   << query.lastError().text();
     qCritical() << "              Driver Message:"   << query.lastError().driverText();
     qCritical() << "                  DB Message:"   << query.lastError().databaseText();
-    
+
     return false;
   }
   return true;
@@ -246,19 +246,13 @@ void AbstractSqlStorage::connectionDestroyed() {
 // ========================================
 //  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()) {
@@ -268,26 +262,3 @@ AbstractSqlStorage::Connection::~Connection() {
   }
   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();
-}