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

Fix errorneous SQL statement when account has no feeds.

Browse Source
This commit is contained in:
Martin Rotter 2020-06-15 09:54:09 +02:00
parent 40c084c59a
commit 037e3d3f96
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librssguard/core/messagesmodel.cpp
View File

@ -43,6 +43,7 @@ void MessagesModel::repopulate() {
if (lastError().isValid()) { if (lastError().isValid()) {
qCritical() << "Error when setting new msg view query:" << lastError().text(); qCritical() << "Error when setting new msg view query:" << lastError().text();
qCritical() << "Used SQL select statement:" << selectStatement();
} }
while (canFetchMore()) { while (canFetchMore()) {

8
src/librssguard/services/abstract/serviceroot.cpp
View File

@ -478,13 +478,19 @@ bool ServiceRoot::loadMessagesForItem(RootItem* item, MessagesModel* model) {
else { else {
QList<Feed*> children = item->getSubTreeFeeds(); QList<Feed*> children = item->getSubTreeFeeds();
QString filter_clause = textualFeedIds(children).join(QSL(", ")); QString filter_clause = textualFeedIds(children).join(QSL(", "));
QString urls = textualFeedUrls(children).join(QSL(", "));
if (filter_clause.isEmpty()) {
filter_clause = QSL("null");
}
model->setFilter( model->setFilter(
QString("Feeds.custom_id IN (%1) AND Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND Messages.account_id = %2").arg( QString("Feeds.custom_id IN (%1) AND Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND Messages.account_id = %2").arg(
filter_clause, filter_clause,
QString:: QString::
number(accountId()))); number(accountId())));
QString urls = textualFeedUrls(children).join(QSL(", "));
qDebug("Displaying messages from feeds IDs: %s and URLs: %s.", qPrintable(filter_clause), qPrintable(urls)); qDebug("Displaying messages from feeds IDs: %s and URLs: %s.", qPrintable(filter_clause), qPrintable(urls));
} }