/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef ABSTRACTSQLSTORAGE_H
-#define ABSTRACTSQLSTORAGE_H
+#pragma once
#include "storage.h"
+#include <memory>
+
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QSqlError>
AbstractSqlStorage(QObject *parent = 0);
virtual ~AbstractSqlStorage();
- virtual inline AbstractSqlMigrationReader *createMigrationReader() { return 0; }
- virtual inline AbstractSqlMigrationWriter *createMigrationWriter() { return 0; }
+ virtual std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() { return {}; }
+ virtual std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() { return {}; }
public slots:
- virtual State init(const QVariantMap &settings = QVariantMap());
- virtual bool setup(const QVariantMap &settings = QVariantMap());
+ virtual State init(const QVariantMap &settings = QVariantMap(),
+ const QProcessEnvironment &environment = {},
+ bool loadFromEnvironment = false);
+ virtual bool setup(const QVariantMap &settings = QVariantMap(),
+ const QProcessEnvironment &environment = {},
+ bool loadFromEnvironment = false);
protected:
inline virtual void sync() {};
virtual bool updateSchemaVersion(int newVersion) = 0;
virtual bool setupSchemaVersion(int version) = 0;
- virtual void setConnectionProperties(const QVariantMap &properties) = 0;
+ virtual void setConnectionProperties(const QVariantMap &properties,
+ const QProcessEnvironment &environment,
+ bool loadFromEnvironment) = 0;
virtual QString driverName() = 0;
inline virtual QString hostName() { return QString(); }
inline virtual int port() { return -1; }
QHash<QThread *, Connection *> _connectionPool;
};
+struct SenderData {
+ QString sender;
+ QString realname;
+ QString avatarurl;
+
+ friend uint qHash(const SenderData &key);
+ friend bool operator==(const SenderData &a, const SenderData &b);
+};
// ========================================
// AbstractSqlStorage::Connection
QString username;
QString password;
int hashversion;
+ QString authenticator;
};
struct SenderMO {
- int senderId;
+ qint64 senderId;
QString sender;
+ QString realname;
+ QString avatarurl;
SenderMO() : senderId(0) {}
};
bool autoAwayReasonEnabled;
bool detachAwayEnabled;
QString detachAwayReason;
- bool detchAwayReasonEnabled;
+ bool detachAwayReasonEnabled;
QString ident;
QString kickReason;
QString partReason;
QString buffername;
QString buffercname;
int buffertype;
- int lastmsgid;
- int lastseenmsgid;
- int markerlinemsgid;
+ qint64 lastmsgid;
+ qint64 lastseenmsgid;
+ qint64 markerlinemsgid;
+ int bufferactivity;
+ int highlightcount;
QString key;
bool joined;
+ QString cipher;
};
struct BacklogMO {
BufferId bufferid;
int type;
int flags;
- int senderid;
+ qint64 senderid;
+ QString senderprefixes;
QString message;
};
QByteArray settingvalue;
};
+ struct CoreStateMO {
+ QString key;
+ QByteArray value;
+ };
+
enum MigrationObject {
QuasselUser,
Sender,
Buffer,
Backlog,
IrcServer,
- UserSetting
+ UserSetting,
+ CoreState
};
AbstractSqlMigrator();
virtual bool readMo(BacklogMO &backlog) = 0;
virtual bool readMo(IrcServerMO &ircserver) = 0;
virtual bool readMo(UserSettingMO &userSetting) = 0;
+ virtual bool readMo(CoreStateMO &coreState) = 0;
bool migrateTo(AbstractSqlMigrationWriter *writer);
virtual bool writeMo(const BacklogMO &backlog) = 0;
virtual bool writeMo(const IrcServerMO &ircserver) = 0;
virtual bool writeMo(const UserSettingMO &userSetting) = 0;
+ virtual bool writeMo(const CoreStateMO &coreState) = 0;
inline bool migrateFrom(AbstractSqlMigrationReader *reader) { return reader->migrateTo(this); }
virtual inline bool postProcess() { return true; }
friend class AbstractSqlMigrationReader;
};
-
-
-#endif