From 037e3d3f96b16e7b81105a6ee21c46292378c5f7 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 15 Jun 2020 09:54:09 +0200 Subject: [PATCH] Fix errorneous SQL statement when account has no feeds. --- src/librssguard/core/messagesmodel.cpp | 1 + src/librssguard/services/abstract/serviceroot.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp index aeddc4840..2e7f4c251 100644 --- a/src/librssguard/core/messagesmodel.cpp +++ b/src/librssguard/core/messagesmodel.cpp @@ -43,6 +43,7 @@ void MessagesModel::repopulate() { if (lastError().isValid()) { qCritical() << "Error when setting new msg view query:" << lastError().text(); + qCritical() << "Used SQL select statement:" << selectStatement(); } while (canFetchMore()) { diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp index 242dadf5e..aef258cc9 100644 --- a/src/librssguard/services/abstract/serviceroot.cpp +++ b/src/librssguard/services/abstract/serviceroot.cpp @@ -478,13 +478,19 @@ bool ServiceRoot::loadMessagesForItem(RootItem* item, MessagesModel* model) { else { QList children = item->getSubTreeFeeds(); QString filter_clause = textualFeedIds(children).join(QSL(", ")); - QString urls = textualFeedUrls(children).join(QSL(", ")); + + if (filter_clause.isEmpty()) { + filter_clause = QSL("null"); + } model->setFilter( QString("Feeds.custom_id IN (%1) AND Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND Messages.account_id = %2").arg( filter_clause, QString:: number(accountId()))); + + QString urls = textualFeedUrls(children).join(QSL(", ")); + qDebug("Displaying messages from feeds IDs: %s and URLs: %s.", qPrintable(filter_clause), qPrintable(urls)); }