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

Fix regression in messages sorting. Now only non-numeric columns are sorted case insensitive - not IDS, dates etc. - fixes #348.

Browse Source
This commit is contained in:
Martin Rotter 2021-01-25 07:37:02 +01:00
parent 7e3bf60d35
commit 3a77cc981f
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.8.4" date="2021-01-22"/> <release version="3.8.4" date="2021-01-25"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

2
resources/scripts/7za

@ -1 +1 @@
Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9

17
src/librssguard/core/messagesmodelsqllayer.cpp
View File

@ -5,7 +5,9 @@
#include "definitions/definitions.h" #include "definitions/definitions.h"
#include "miscellaneous/application.h" #include "miscellaneous/application.h"
MessagesModelSqlLayer::MessagesModelSqlLayer() : m_filter(QSL(DEFAULT_SQL_MESSAGES_FILTER)) { MessagesModelSqlLayer::MessagesModelSqlLayer()
: m_filter(QSL(DEFAULT_SQL_MESSAGES_FILTER)), m_fieldNames({}), m_orderByNames({}),
m_sortColumns({}), m_numericColumns({}), m_sortOrders({}) {
m_db = qApp->database()->connection(QSL("MessagesModel")); m_db = qApp->database()->connection(QSL("MessagesModel"));
// Used in <x>: SELECT <x1>, <x2> FROM ....; // Used in <x>: SELECT <x1>, <x2> FROM ....;
@ -45,6 +47,9 @@ MessagesModelSqlLayer::MessagesModelSqlLayer() : m_filter(QSL(DEFAULT_SQL_MESSAG
m_orderByNames[MSG_DB_CUSTOM_HASH_INDEX] = "Messages.custom_hash"; m_orderByNames[MSG_DB_CUSTOM_HASH_INDEX] = "Messages.custom_hash";
m_orderByNames[MSG_DB_FEED_CUSTOM_ID_INDEX] = "Messages.feed"; m_orderByNames[MSG_DB_FEED_CUSTOM_ID_INDEX] = "Messages.feed";
m_orderByNames[MSG_DB_HAS_ENCLOSURES] = "has_enclosures"; m_orderByNames[MSG_DB_HAS_ENCLOSURES] = "has_enclosures";
m_numericColumns << MSG_DB_ID_INDEX << MSG_DB_READ_INDEX << MSG_DB_DELETED_INDEX << MSG_DB_PDELETED_INDEX
<< MSG_DB_IMPORTANT_INDEX << MSG_DB_ACCOUNT_ID_INDEX << MSG_DB_DCREATED_INDEX;
} }
void MessagesModelSqlLayer::addSortState(int column, Qt::SortOrder order) { void MessagesModelSqlLayer::addSortState(int column, Qt::SortOrder order) {
@ -82,6 +87,10 @@ QString MessagesModelSqlLayer::formatFields() const {
return m_fieldNames.values().join(QSL(", ")); return m_fieldNames.values().join(QSL(", "));
} }
bool MessagesModelSqlLayer::isColumnNumeric(int column_id) const {
return m_numericColumns.contains(column_id);
}
QString MessagesModelSqlLayer::selectStatement() const { QString MessagesModelSqlLayer::selectStatement() const {
return QL1S("SELECT ") + formatFields() + QL1C(' ') + return QL1S("SELECT ") + formatFields() + QL1C(' ') +
QL1S("FROM Messages LEFT JOIN Feeds ON Messages.feed = Feeds.custom_id AND Messages.account_id = Feeds.account_id " QL1S("FROM Messages LEFT JOIN Feeds ON Messages.feed = Feeds.custom_id AND Messages.account_id = Feeds.account_id "
@ -98,8 +107,12 @@ QString MessagesModelSqlLayer::orderByClause() const {
for (int i = 0; i < m_sortColumns.size(); i++) { for (int i = 0; i < m_sortColumns.size(); i++) {
QString field_name(m_orderByNames[m_sortColumns[i]]); QString field_name(m_orderByNames[m_sortColumns[i]]);
QString order_sql = isColumnNumeric(m_sortColumns[i])
? QSL("%1")
: QSL("LOWER(%1)");
sorts.append(QSL("LOWER(%1)").arg(field_name) + (m_sortOrders[i] == Qt::AscendingOrder ? QSL(" ASC") : QSL(" DESC"))); sorts.append(order_sql.arg(field_name) +
(m_sortOrders[i] == Qt::SortOrder::AscendingOrder ? QSL(" ASC") : QSL(" DESC")));
} }
return QL1S(" ORDER BY ") + sorts.join(QSL(", ")); return QL1S(" ORDER BY ") + sorts.join(QSL(", "));

3
src/librssguard/core/messagesmodelsqllayer.h
View File

@ -23,6 +23,8 @@ class MessagesModelSqlLayer {
QString selectStatement() const; QString selectStatement() const;
QString formatFields() const; QString formatFields() const;
bool isColumnNumeric(int column_id) const;
QSqlDatabase m_db; QSqlDatabase m_db;
private: private:
@ -34,6 +36,7 @@ class MessagesModelSqlLayer {
QMap<int, QString> m_fieldNames; QMap<int, QString> m_fieldNames;
QMap<int, QString> m_orderByNames; QMap<int, QString> m_orderByNames;
QList<int> m_sortColumns; QList<int> m_sortColumns;
QList<int> m_numericColumns;
QList<Qt::SortOrder> m_sortOrders; QList<Qt::SortOrder> m_sortOrders;
}; };