From b0e2b4bb5d8fffe7ef1589d93af7fb40cdda65f9 Mon Sep 17 00:00:00 2001 From: Ganael Laplanche Date: Tue, 3 Sep 2024 12:28:24 +0200 Subject: [PATCH] Fix LIKE statements using double quotes instead of single ones (#1481) --- src/librssguard/database/databasequeries.cpp | 8 ++++---- src/librssguard/services/abstract/serviceroot.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp index 4973d1171..4a1d73719 100644 --- a/src/librssguard/database/databasequeries.cpp +++ b/src/librssguard/database/databasequeries.cpp @@ -42,13 +42,13 @@ QMap DatabaseQueries::messageTableAttributes(bool only_msg_table, if (is_sqlite) { field_names[MSG_DB_LABELS] = - QSL("(SELECT GROUP_CONCAT(Labels.name) FROM Labels WHERE Messages.labels LIKE \"%.\" || " - "Labels.custom_id || \".%\") as msg_labels"); + QSL("(SELECT GROUP_CONCAT(Labels.name) FROM Labels WHERE Messages.labels LIKE '%.' || " + "Labels.custom_id || '.%') as msg_labels"); } else { field_names[MSG_DB_LABELS] = - QSL("(SELECT GROUP_CONCAT(Labels.name) FROM Labels WHERE Messages.labels LIKE CONCAT(\"%.\", " - "Labels.custom_id, \".%\")) as msg_labels"); + QSL("(SELECT GROUP_CONCAT(Labels.name) FROM Labels WHERE Messages.labels LIKE CONCAT('%.', " + "Labels.custom_id, '.%')) as msg_labels"); } field_names[MSG_DB_LABELS_IDS] = QSL("Messages.labels"); diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp index b20ef343a..d5d78a0cd 100644 --- a/src/librssguard/services/abstract/serviceroot.cpp +++ b/src/librssguard/services/abstract/serviceroot.cpp @@ -918,7 +918,7 @@ bool ServiceRoot::loadMessagesForItem(RootItem* item, MessagesModel* model) { else if (item->kind() == RootItem::Kind::Label) { // Show messages with particular label. model->setFilter(QSL("Messages.is_deleted = 0 AND Messages.is_pdeleted = 0 AND " - "Messages.labels LIKE \"%.%2.%\" AND Messages.account_id = %1") + "Messages.labels LIKE '%.%2.%' AND Messages.account_id = %1") .arg(QString::number(accountId()), item->customId())); } else if (item->kind() == RootItem::Kind::Labels) {