FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct calling habits for database connections.

Browse Source
This commit is contained in:
Martin Rotter 2014-01-20 07:41:58 +01:00
parent 6d0bdca99e
commit 772a871ba7
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/feedsmodel.cpp
View File

@ -175,7 +175,8 @@ bool FeedsModel::removeItem(const QModelIndex &index) {
QList<Message> FeedsModel::messagesForFeeds(const QList<FeedsModelFeed*> &feeds) {
QList<Message> messages;
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection(objectName(),
false);
QSqlQuery query_read_msg(database);
query_read_msg.setForwardOnly(true);
query_read_msg.prepare("SELECT title, url, author, date_created, contents "
@ -317,7 +318,8 @@ void FeedsModel::loadFromDatabase() {
qDeleteAll(m_rootItem->childItems());
m_rootItem->clearChildren();
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection(objectName(),
false);
CategoryAssignment categories;
FeedAssignment feeds;
@ -429,7 +431,8 @@ QList<FeedsModelFeed*> FeedsModel::feedsForIndexes(const QModelIndexList &indexe
bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
int read) {
QSqlDatabase db_handle = DatabaseFactory::instance()->connection();
QSqlDatabase db_handle = DatabaseFactory::instance()->connection(objectName(),
false);
if (!db_handle.transaction()) {
qWarning("Starting transaction for feeds read change.");
@ -465,7 +468,8 @@ bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
bool FeedsModel::markFeedsDeleted(const QList<FeedsModelFeed *> &feeds,
int deleted) {
QSqlDatabase db_handle = DatabaseFactory::instance()->connection();
QSqlDatabase db_handle = DatabaseFactory::instance()->connection(objectName(),
false);
if (!db_handle.transaction()) {
qWarning("Starting transaction for feeds clearing.");

3
src/core/feedsmodelfeed.cpp
View File

@ -47,7 +47,8 @@ QString FeedsModelFeed::typeToString(FeedsModelFeed::Type type) {
}
void FeedsModelFeed::updateCounts(bool including_total_count) {
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelFeed",
false);
QSqlQuery query_all(database);
query_all.setForwardOnly(true);

6
src/core/feedsmodelstandardcategory.cpp
View File

@ -93,7 +93,8 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const {
bool FeedsModelStandardCategory::addItself() {
// Children are removed, remove this standard category too.
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardCategory",
false);
QSqlQuery query_add(database);
query_add.setForwardOnly(true);
@ -137,7 +138,8 @@ bool FeedsModelStandardCategory::removeItself() {
}
// Children are removed, remove this standard category too.
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardCategory",
false);
QSqlQuery query_remove(database);
query_remove.setForwardOnly(true);

6
src/core/feedsmodelstandardfeed.cpp
View File

@ -163,7 +163,8 @@ void FeedsModelStandardFeed::update() {
}
bool FeedsModelStandardFeed::removeItself() {
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardFeed",
false);
QSqlQuery query_remove(database);
query_remove.setForwardOnly(true);
@ -186,7 +187,8 @@ bool FeedsModelStandardFeed::removeItself() {
void FeedsModelStandardFeed::updateMessages(const QList<Message> &messages) {
int feed_id = id(), message_id;
qint64 message_creation_date;
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardFeed",
false);
// Prepare queries.
QSqlQuery query_select(database);

3
src/core/messagesmodel.cpp
View File

@ -13,7 +13,8 @@
MessagesModel::MessagesModel(QObject *parent)
: QSqlTableModel(parent,
DatabaseFactory::instance()->connection()) {
DatabaseFactory::instance()->connection("MessagesModel",
false)) {
setObjectName("MessagesModel");
setupFonts();

2
src/gui/formmain.cpp
View File

@ -194,7 +194,7 @@ void FormMain::onAboutToQuit() {
m_ui->m_tabWidget->feedMessageViewer()->quitDownloader();
DatabaseFactory::instance()->saveMemoryDatabase();
//DatabaseFactory::instance()->saveMemoryDatabase();
saveSize();
}