projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish 64-bit time conversion, modify protocol
[quassel.git]
/
src
/
core
/
abstractsqlstorage.cpp
diff --git
a/src/core/abstractsqlstorage.cpp
b/src/core/abstractsqlstorage.cpp
index
4ecf623
..
9fe95b9
100644
(file)
--- a/
src/core/abstractsqlstorage.cpp
+++ b/
src/core/abstractsqlstorage.cpp
@@
-116,9
+116,11
@@
void AbstractSqlStorage::dbConnect(QSqlDatabase &db)
}
}
-Storage::State AbstractSqlStorage::init(const QVariantMap &settings)
+Storage::State AbstractSqlStorage::init(const QVariantMap &settings,
+ const QProcessEnvironment &environment,
+ bool loadFromEnvironment)
{
{
- setConnectionProperties(settings);
+ setConnectionProperties(settings
, environment, loadFromEnvironment
);
_debug = Quassel::isOptionSet("debug");
_debug = Quassel::isOptionSet("debug");
@@
-192,9
+194,10
@@
QStringList AbstractSqlStorage::setupQueries()
}
}
-bool AbstractSqlStorage::setup(const QVariantMap &settings)
+bool AbstractSqlStorage::setup(const QVariantMap &settings, const QProcessEnvironment &environment,
+ bool loadFromEnvironment)
{
{
- setConnectionProperties(settings);
+ setConnectionProperties(settings
, environment, loadFromEnvironment
);
QSqlDatabase db = logDb();
if (!db.isOpen()) {
qCritical() << "Unable to setup Logging Backend!";
QSqlDatabase db = logDb();
if (!db.isOpen()) {
qCritical() << "Unable to setup Logging Backend!";
@@
-409,6
+412,8
@@
QString AbstractSqlMigrator::migrationObject(MigrationObject moType)
return "IrcServer";
case UserSetting:
return "UserSetting";
return "IrcServer";
case UserSetting:
return "UserSetting";
+ case CoreState:
+ return "CoreState";
};
return QString();
}
};
return QString();
}
@@
-502,6
+507,10
@@
bool AbstractSqlMigrationReader::migrateTo(AbstractSqlMigrationWriter *writer)
if (!transferMo(UserSetting, userSettingMo))
return false;
if (!transferMo(UserSetting, userSettingMo))
return false;
+ CoreStateMO coreStateMO;
+ if (!transferMo(CoreState, coreStateMO))
+ return false;
+
if (!_writer->postProcess())
abortMigration();
return finalizeMigration();
if (!_writer->postProcess())
abortMigration();
return finalizeMigration();