projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Fix IrcUser::quitInternal not syncing quit
[quassel.git]
/
src
/
core
/
abstractsqlstorage.h
diff --git
a/src/core/abstractsqlstorage.h
b/src/core/abstractsqlstorage.h
index
88ecfb5
..
c2521f5
100644
(file)
--- a/
src/core/abstractsqlstorage.h
+++ b/
src/core/abstractsqlstorage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
19
by the Quassel Project *
+ * Copyright (C) 2005-20
20
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 *
@@
-21,14
+21,18
@@
#pragma once
#include <memory>
#pragma once
#include <memory>
+#include <vector>
-#include <QList>
+#include <QHash>
+#include <QMutex>
#include <QSqlDatabase>
#include <QSqlError>
#include <QSqlQuery>
#include "storage.h"
#include <QSqlDatabase>
#include <QSqlError>
#include <QSqlQuery>
#include "storage.h"
+class QThread;
+
class AbstractSqlMigrationReader;
class AbstractSqlMigrationWriter;
class AbstractSqlMigrationReader;
class AbstractSqlMigrationWriter;
@@
-87,7
+91,12
@@
protected:
*/
QString queryString(const QString& queryName, int version = 0);
*/
QString queryString(const QString& queryName, int version = 0);
- QStringList setupQueries();
+ /**
+ * Gets the collection of SQL setup queries and filenames to create a new database
+ *
+ * @return List of SQL query strings and filenames
+ */
+ std::vector<SqlQueryResource> setupQueries();
/**
* Gets the collection of SQL upgrade queries and filenames for a given schema version
/**
* Gets the collection of SQL upgrade queries and filenames for a given schema version
@@
-95,7
+104,7
@@
protected:
* @param ver SQL schema version
* @return List of SQL query strings and filenames
*/
* @param ver SQL schema version
* @return List of SQL query strings and filenames
*/
-
QList
<SqlQueryResource> upgradeQueries(int ver);
+
std::vector
<SqlQueryResource> upgradeQueries(int ver);
bool upgradeDb();
bool watchQuery(QSqlQuery& query);
bool upgradeDb();
bool watchQuery(QSqlQuery& query);