projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
active and inactive networks are now expanded and collapsed properly
[quassel.git]
/
src
/
core
/
abstractsqlstorage.cpp
diff --git
a/src/core/abstractsqlstorage.cpp
b/src/core/abstractsqlstorage.cpp
index
bc18caf
..
b20d1dc
100644
(file)
--- a/
src/core/abstractsqlstorage.cpp
+++ b/
src/core/abstractsqlstorage.cpp
@@
-50,7
+50,7
@@
QSqlDatabase AbstractSqlStorage::logDb() {
return db;
if(!openDb()) {
return db;
if(!openDb()) {
- qWarning() << "Unable to Open Database" <<
engine
Name();
+ qWarning() << "Unable to Open Database" <<
display
Name();
qWarning() << " -" << db.lastError().text();
}
qWarning() << " -" << db.lastError().text();
}
@@
-102,13
+102,23
@@
bool AbstractSqlStorage::init(const QVariantMap &settings) {
return true;
}
return true;
}
+void AbstractSqlStorage::sync() {
+ QHash<QPair<QString, int>, 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();
QString AbstractSqlStorage::queryString(const QString &queryName, int version) {
if(version == 0)
version = schemaVersion();
- QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(
engine
Name()).arg(version).arg(queryName));
+ QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(
display
Name()).arg(version).arg(queryName));
if(!queryInfo.exists() || !queryInfo.isFile() || !queryInfo.isReadable()) {
if(!queryInfo.exists() || !queryInfo.isFile() || !queryInfo.isReadable()) {
- qWarning() << "Unable to read SQL-Query" << queryName << "for
Engine" << engine
Name();
+ qWarning() << "Unable to read SQL-Query" << queryName << "for
engine" << display
Name();
return QString();
}
return QString();
}
@@
-141,7
+151,7
@@
QSqlQuery *AbstractSqlStorage::cachedQuery(const QString &queryName) {
QStringList AbstractSqlStorage::setupQueries() {
QStringList queries;
QStringList AbstractSqlStorage::setupQueries() {
QStringList queries;
- QDir dir = QDir(QString(":/SQL/%1/%2/").arg(
engine
Name()).arg(schemaVersion()));
+ QDir dir = QDir(QString(":/SQL/%1/%2/").arg(
display
Name()).arg(schemaVersion()));
foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "setup*", QDir::NoFilter, QDir::Name)) {
queries << queryString(fileInfo.baseName());
}
foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "setup*", QDir::NoFilter, QDir::Name)) {
queries << queryString(fileInfo.baseName());
}
@@
-168,9
+178,9
@@
bool AbstractSqlStorage::setup(const QVariantMap &settings) {
QStringList AbstractSqlStorage::upgradeQueries(int version) {
QStringList queries;
QStringList AbstractSqlStorage::upgradeQueries(int version) {
QStringList queries;
- QDir dir = QDir(QString(":/SQL/%1/%2/").arg(
engine
Name()).arg(version));
+ QDir dir = QDir(QString(":/SQL/%1/%2/").arg(
display
Name()).arg(version));
foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "upgrade*", QDir::NoFilter, QDir::Name)) {
foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "upgrade*", QDir::NoFilter, QDir::Name)) {
- queries << queryString(fileInfo.baseName());
+ queries << queryString(fileInfo.baseName()
, version
);
}
return queries;
}
}
return queries;
}
@@
-202,7
+212,7
@@
int AbstractSqlStorage::schemaVersion() {
int version;
bool ok;
int version;
bool ok;
- QDir dir = QDir(":/SQL/" +
engine
Name());
+ QDir dir = QDir(":/SQL/" +
display
Name());
foreach(QFileInfo fileInfo, dir.entryInfoList()) {
if(!fileInfo.isDir())
continue;
foreach(QFileInfo fileInfo, dir.entryInfoList()) {
if(!fileInfo.isDir())
continue;