X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.h;h=7075db961d92259874b261fe7ca020b3730db8de;hp=efd1ce396a75a1b95606537bc6acb73b9e11569a;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h index efd1ce39..7075db96 100644 --- a/src/core/abstractsqlstorage.h +++ b/src/core/abstractsqlstorage.h @@ -20,13 +20,13 @@ #pragma once -#include "storage.h" - #include #include -#include #include +#include + +#include "storage.h" class AbstractSqlMigrationReader; class AbstractSqlMigrationWriter; @@ -36,22 +36,22 @@ class AbstractSqlStorage : public Storage Q_OBJECT public: - AbstractSqlStorage(QObject *parent = nullptr); + AbstractSqlStorage(QObject* parent = nullptr); ~AbstractSqlStorage() override; virtual std::unique_ptr createMigrationReader() { return {}; } virtual std::unique_ptr createMigrationWriter() { return {}; } public slots: - State init(const QVariantMap &settings = QVariantMap(), - const QProcessEnvironment &environment = {}, - bool loadFromEnvironment = false) override; - bool setup(const QVariantMap &settings = QVariantMap(), - const QProcessEnvironment &environment = {}, - bool loadFromEnvironment = false) override; + State init(const QVariantMap& settings = QVariantMap(), + const QProcessEnvironment& environment = {}, + bool loadFromEnvironment = false) override; + bool setup(const QVariantMap& settings = QVariantMap(), + const QProcessEnvironment& environment = {}, + bool loadFromEnvironment = false) override; protected: - inline void sync() override {}; + inline void sync() override{}; QSqlDatabase logDb(); @@ -72,23 +72,21 @@ protected: * @endparblock * @return String with the requested SQL query, ready for parameter substitution */ - QString queryString(const QString &queryName, int version = 0); + QString queryString(const QString& queryName, int version = 0); QStringList setupQueries(); QStringList upgradeQueries(int ver); bool upgradeDb(); - bool watchQuery(QSqlQuery &query); + bool watchQuery(QSqlQuery& query); int schemaVersion(); virtual int installedSchemaVersion() { return -1; }; virtual bool updateSchemaVersion(int newVersion) = 0; virtual bool setupSchemaVersion(int version) = 0; - virtual void setConnectionProperties(const QVariantMap &properties, - const QProcessEnvironment &environment, - bool loadFromEnvironment) = 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; } @@ -103,14 +101,14 @@ protected: * When reimplementing this method, don't use logDB() inside this function as * this would cause as we're just about to initialize that DB connection. */ - inline virtual bool initDbSession(QSqlDatabase & /* db */) { return true; } + inline virtual bool initDbSession(QSqlDatabase& /* db */) { return true; } private slots: void connectionDestroyed(); private: void addConnectionToPool(); - void dbConnect(QSqlDatabase &db); + void dbConnect(QSqlDatabase& db); int _schemaVersion{0}; bool _debug; @@ -121,16 +119,17 @@ private: // those objects reside in the thread the connection belongs to // which allows us thread safe termination of a connection class Connection; - QHash _connectionPool; + QHash _connectionPool; }; -struct SenderData { +struct SenderData +{ QString sender; QString realname; QString avatarurl; - friend uint qHash(const SenderData &key); - friend bool operator==(const SenderData &a, const SenderData &b); + friend uint qHash(const SenderData& key); + friend bool operator==(const SenderData& a, const SenderData& b); }; // ======================================== @@ -141,7 +140,7 @@ class AbstractSqlStorage::Connection : public QObject Q_OBJECT public: - Connection(const QString &name, QObject *parent = nullptr); + Connection(const QString& name, QObject* parent = nullptr); ~Connection() override; inline QLatin1String name() const { return QLatin1String(_name); } @@ -150,7 +149,6 @@ private: QByteArray _name; }; - // ======================================== // AbstractSqlMigrator // ======================================== @@ -158,7 +156,8 @@ class AbstractSqlMigrator { public: // migration objects - struct QuasselUserMO { + struct QuasselUserMO + { UserId id; QString username; QString password; @@ -166,14 +165,16 @@ public: QString authenticator; }; - struct SenderMO { + struct SenderMO + { qint64 senderId{0}; QString sender; QString realname; QString avatarurl; }; - struct IdentityMO { + struct IdentityMO + { IdentityId id; UserId userid; QString identityname; @@ -197,13 +198,15 @@ public: QByteArray sslKey; }; - struct IdentityNickMO { + struct IdentityNickMO + { int nickid; IdentityId identityId; QString nick; }; - struct NetworkMO { + struct NetworkMO + { UserId userid; QString networkname; QString perform; @@ -235,7 +238,8 @@ public: bool connected; }; - struct BufferMO { + struct BufferMO + { BufferId bufferid; UserId userid; int groupid; @@ -253,9 +257,10 @@ public: QString cipher; }; - struct BacklogMO { + struct BacklogMO + { MsgId messageid; - QDateTime time; // has to be in UTC! + QDateTime time; // has to be in UTC! BufferId bufferid; int type; int flags; @@ -264,7 +269,8 @@ public: QString message; }; - struct IrcServerMO { + struct IrcServerMO + { int serverid; UserId userid; NetworkId networkid; @@ -272,7 +278,7 @@ public: int port; QString password; bool ssl; - bool sslverify; /// If true, validate SSL certificates + bool sslverify; /// If true, validate SSL certificates int sslversion; bool useproxy; int proxytype; @@ -282,18 +288,21 @@ public: QString proxypass; }; - struct UserSettingMO { + struct UserSettingMO + { UserId userid; QString settingname; QByteArray settingvalue; }; - struct CoreStateMO { + struct CoreStateMO + { QString key; QByteArray value; }; - enum MigrationObject { + enum MigrationObject + { QuasselUser, Sender, Identity, @@ -311,14 +320,14 @@ public: static QString migrationObject(MigrationObject moType); protected: - void newQuery(const QString &query, QSqlDatabase db); + void newQuery(const QString& query, QSqlDatabase db); virtual void resetQuery(); virtual bool prepareQuery(MigrationObject mo) = 0; bool exec(); inline bool next() { return _query->next(); } inline QVariant value(int index) { return _query->value(index); } - inline void bindValue(const QString &placeholder, const QVariant &val) { _query->bindValue(placeholder, val); } - inline void bindValue(int pos, const QVariant &val) { _query->bindValue(pos, val); } + inline void bindValue(const QString& placeholder, const QVariant& val) { _query->bindValue(placeholder, val); } + inline void bindValue(int pos, const QVariant& val) { _query->bindValue(pos, val); } inline QSqlError lastError() { return _query ? _query->lastError() : QSqlError(); } void dumpStatus(); @@ -330,53 +339,52 @@ protected: virtual bool commit() = 0; private: - QSqlQuery *_query{nullptr}; + QSqlQuery* _query{nullptr}; }; - class AbstractSqlMigrationReader : public AbstractSqlMigrator { public: AbstractSqlMigrationReader(); - virtual bool readMo(QuasselUserMO &user) = 0; - virtual bool readMo(IdentityMO &identity) = 0; - virtual bool readMo(IdentityNickMO &identityNick) = 0; - virtual bool readMo(NetworkMO &network) = 0; - virtual bool readMo(BufferMO &buffer) = 0; - virtual bool readMo(SenderMO &sender) = 0; - virtual bool readMo(BacklogMO &backlog) = 0; - virtual bool readMo(IrcServerMO &ircserver) = 0; - virtual bool readMo(UserSettingMO &userSetting) = 0; - virtual bool readMo(CoreStateMO &coreState) = 0; + virtual bool readMo(QuasselUserMO& user) = 0; + virtual bool readMo(IdentityMO& identity) = 0; + virtual bool readMo(IdentityNickMO& identityNick) = 0; + virtual bool readMo(NetworkMO& network) = 0; + virtual bool readMo(BufferMO& buffer) = 0; + virtual bool readMo(SenderMO& sender) = 0; + 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); + bool migrateTo(AbstractSqlMigrationWriter* writer); private: - void abortMigration(const QString &errorMsg = QString()); + void abortMigration(const QString& errorMsg = QString()); bool finalizeMigration(); - template bool transferMo(MigrationObject moType, T &mo); + template + bool transferMo(MigrationObject moType, T& mo); - AbstractSqlMigrationWriter *_writer{nullptr}; + AbstractSqlMigrationWriter* _writer{nullptr}; }; - class AbstractSqlMigrationWriter : public AbstractSqlMigrator { public: - virtual bool writeMo(const QuasselUserMO &user) = 0; - virtual bool writeMo(const IdentityMO &identity) = 0; - virtual bool writeMo(const IdentityNickMO &identityNick) = 0; - virtual bool writeMo(const NetworkMO &network) = 0; - virtual bool writeMo(const BufferMO &buffer) = 0; - virtual bool writeMo(const SenderMO &sender) = 0; - 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 bool writeMo(const QuasselUserMO& user) = 0; + virtual bool writeMo(const IdentityMO& identity) = 0; + virtual bool writeMo(const IdentityNickMO& identityNick) = 0; + virtual bool writeMo(const NetworkMO& network) = 0; + virtual bool writeMo(const BufferMO& buffer) = 0; + virtual bool writeMo(const SenderMO& sender) = 0; + 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); } // called after migration process virtual inline bool postProcess() { return true; }