projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes #413 - Icons in Nicklist
[quassel.git]
/
src
/
core
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
bbe4d08
..
e3b4ec4
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-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 *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-35,17
+35,14
@@
public:
virtual ~AbstractSqlStorage();
protected:
virtual ~AbstractSqlStorage();
protected:
- virtual
bool
init(const QVariantMap &settings = QVariantMap());
-
virtual void sync()
;
+ virtual
State
init(const QVariantMap &settings = QVariantMap());
+
inline virtual void sync() {}
;
QSqlDatabase logDb();
QString queryString(const QString &queryName, int version);
inline QString queryString(const QString &queryName) { return queryString(queryName, 0); }
QSqlDatabase logDb();
QString queryString(const QString &queryName, int version);
inline QString queryString(const QString &queryName) { return queryString(queryName, 0); }
- QSqlQuery &cachedQuery(const QString &queryName, int version);
- inline QSqlQuery &cachedQuery(const QString &queryName) { return cachedQuery(queryName, 0); }
-
QStringList setupQueries();
bool setup(const QVariantMap &settings = QVariantMap());
QStringList setupQueries();
bool setup(const QVariantMap &settings = QVariantMap());
@@
-56,6
+53,8
@@
protected:
int schemaVersion();
virtual int installedSchemaVersion() { return -1; };
int schemaVersion();
virtual int installedSchemaVersion() { return -1; };
+ virtual bool updateSchemaVersion(int newVersion) = 0;
+ virtual bool setupSchemaVersion(int version) = 0;
virtual QString driverName() = 0;
inline virtual QString hostName() { return QString(); }
virtual QString driverName() = 0;
inline virtual QString hostName() { return QString(); }
@@
-63,9
+62,6
@@
protected:
inline virtual QString userName() { return QString(); }
inline virtual QString password() { return QString(); }
inline virtual QString userName() { return QString(); }
inline virtual QString password() { return QString(); }
-signals:
- void syncCachedQueries();
-
private slots:
void connectionDestroyed();
private slots:
void connectionDestroyed();
@@
-76,6
+72,9
@@
private:
int _nextConnectionId;
QMutex _connectionPoolMutex;
int _nextConnectionId;
QMutex _connectionPoolMutex;
+ // we let a Connection Object manage each actual db connection
+ // those objects reside in the thread the connection belongs to
+ // which allows us thread safe termination of a connection
class Connection;
QHash<QThread *, Connection *> _connectionPool;
};
class Connection;
QHash<QThread *, Connection *> _connectionPool;
};
@@
-87,19
+86,13
@@
class AbstractSqlStorage::Connection : public QObject {
Q_OBJECT
public:
Q_OBJECT
public:
- Connection(const QString &name,
AbstractSqlStorage *storage,
QObject *parent = 0);
+ Connection(const QString &name, QObject *parent = 0);
~Connection();
inline QLatin1String name() const { return QLatin1String(_name); }
~Connection();
inline QLatin1String name() const { return QLatin1String(_name); }
- QSqlQuery &cachedQuery(const QString &queryName, int version);
-
-public slots:
- void syncCachedQueries();
private:
QByteArray _name;
private:
QByteArray _name;
- QHash<QPair<QString, int>, QSqlQuery *> _queryCache;
- AbstractSqlStorage *_storageEngine;
};
#endif
};
#endif